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
TextView - Split width exceed policy and EllipsizeEnd height exceed policy combinatio...
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
controls
/
text-view
/
text-view-impl.cpp
diff --git
a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
index
7e9c5fa
..
426357d
100644
(file)
--- a/
base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
+++ b/
base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
@@
-1779,6
+1779,11
@@
void TextView::CombineExceedPolicies()
mLayoutParameters.mExceedPolicy = SplitShrink;
break;
}
mLayoutParameters.mExceedPolicy = SplitShrink;
break;
}
+ case Toolkit::TextView::EllipsizeEnd:
+ {
+ mLayoutParameters.mExceedPolicy = SplitEllipsizeEnd;
+ break;
+ }
default:
{
DALI_ASSERT_ALWAYS( !"TextView::CombineExceedPolicies() Invalid width and height exceed policies combination" );
default:
{
DALI_ASSERT_ALWAYS( !"TextView::CombineExceedPolicies() Invalid width and height exceed policies combination" );