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 "Change tc according to blending factor change for premultiplied alpha format...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-model.cpp
diff --git
a/dali-toolkit/internal/text/text-model.cpp
b/dali-toolkit/internal/text/text-model.cpp
index
7f23aac
..
84b0428
100755
(executable)
--- a/
dali-toolkit/internal/text/text-model.cpp
+++ b/
dali-toolkit/internal/text/text-model.cpp
@@
-1,5
+1,5
@@
/*
/*
- * 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.
@@
-167,6
+167,16
@@
float Model::GetOutlineWidth() const
return mVisualModel->GetOutlineWidth();
}
return mVisualModel->GetOutlineWidth();
}
+const Vector4& Model::GetBackgroundColor() const
+{
+ return mVisualModel->GetBackgroundColor();
+}
+
+bool Model::IsBackgroundEnabled() const
+{
+ return mVisualModel->IsBackgroundEnabled();
+}
+
Model::Model()
: mLogicalModel(),
mVisualModel(),
Model::Model()
: mLogicalModel(),
mVisualModel(),