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
Purge underscored header file barriers
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
decorator
/
text-decorator.cpp
diff --git
a/dali-toolkit/internal/text/decorator/text-decorator.cpp
b/dali-toolkit/internal/text/decorator/text-decorator.cpp
index
aa4d5c6
..
d0f89d9
100644
(file)
--- a/
dali-toolkit/internal/text/decorator/text-decorator.cpp
+++ b/
dali-toolkit/internal/text/decorator/text-decorator.cpp
@@
-46,7
+46,7
@@
namespace
{
const char* VERTEX_SHADER = MAKE_SHADER(
attribute mediump vec2 aPosition;
{
const char* VERTEX_SHADER = MAKE_SHADER(
attribute mediump vec2 aPosition;
-uniform
mediump mat4
uMvpMatrix;
+uniform
highp mat4
uMvpMatrix;
void main()
{
void main()
{
@@
-2242,6
+2242,11
@@
bool Decorator::IsHighlightActive() const
return mImpl->mIsHighlightBoxActive;
}
return mImpl->mIsHighlightBoxActive;
}
+bool Decorator::IsHighlightVisible() const
+{
+ return ( mImpl->mHighlightActor && mImpl->mHighlightActor.GetParent() );
+}
+
void Decorator::SetTextDepth( int textDepth )
{
mImpl->mTextDepth = textDepth;
void Decorator::SetTextDepth( int textDepth )
{
mImpl->mTextDepth = textDepth;