projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Bitmap Font support for TextLabel." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
view-model.h
diff --git
a/dali-toolkit/internal/text/rendering/view-model.h
b/dali-toolkit/internal/text/rendering/view-model.h
index
0c0bb01
..
bc7d45f
100755
(executable)
--- a/
dali-toolkit/internal/text/rendering/view-model.h
+++ b/
dali-toolkit/internal/text/rendering/view-model.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_TEXT_VIEW_MODEL_H
/*
#define DALI_TOOLKIT_TEXT_VIEW_MODEL_H
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-24,6
+24,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/text/text-enumerations.h>
#include <dali-toolkit/internal/text/text-model-interface.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/text/text-enumerations.h>
#include <dali-toolkit/internal/text/text-model-interface.h>
+#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
namespace Dali
{
namespace Dali
{
@@
-83,6
+84,11
@@
public:
virtual Text::VerticalAlignment::Type GetVerticalAlignment() const;
/**
virtual Text::VerticalAlignment::Type GetVerticalAlignment() const;
/**
+ * @copydoc ModelInterface::GetVerticalLineAlignment()
+ */
+ virtual DevelText::VerticalLineAlignment::Type GetVerticalLineAlignment() const;
+
+ /**
* @copydoc ModelInterface::IsTextElideEnabled()
*/
virtual bool IsTextElideEnabled() const;
* @copydoc ModelInterface::IsTextElideEnabled()
*/
virtual bool IsTextElideEnabled() const;
@@
-185,9
+191,19
@@
public:
/**
* @copydoc ModelInterface::GetOutlineWidth()
*/
/**
* @copydoc ModelInterface::GetOutlineWidth()
*/
- virtual float GetOutlineWidth() const;
+ virtual uint16_t GetOutlineWidth() const;
+
+ /**
+ * @copydoc ModelInterface::GetBackgroundColor()
+ */
+ virtual const Vector4& GetBackgroundColor() const;
- /**
+ /**
+ * @copydoc ModelInterface::IsBackgroundEnabled()
+ */
+ virtual bool IsBackgroundEnabled() const;
+
+/**
* @brief Does the text elide.
*
* It stores a copy of the visible glyphs and removes as many glyphs as needed
* @brief Does the text elide.
*
* It stores a copy of the visible glyphs and removes as many glyphs as needed