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
Fix to build incrementally with gbs
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-relayouter.cpp
diff --git
a/dali-toolkit/internal/text/text-controller-relayouter.cpp
b/dali-toolkit/internal/text/text-controller-relayouter.cpp
index
decbfc1
..
4c71934
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-relayouter.cpp
+++ b/
dali-toolkit/internal/text/text-controller-relayouter.cpp
@@
-544,6
+544,7
@@
bool Controller::Relayouter::DoRelayout(Controller& controller, const Size& size
// Update the ellipsis
bool elideTextEnabled = impl.mModel->mElideEnabled;
// Update the ellipsis
bool elideTextEnabled = impl.mModel->mElideEnabled;
+ auto ellipsisPosition = impl.mModel->mEllipsisPosition;
if(NULL != impl.mEventData)
{
if(NULL != impl.mEventData)
{
@@
-570,7
+571,8
@@
bool Controller::Relayouter::DoRelayout(Controller& controller, const Size& size
viewUpdated = impl.mLayoutEngine.LayoutText(layoutParameters,
newLayoutSize,
elideTextEnabled,
viewUpdated = impl.mLayoutEngine.LayoutText(layoutParameters,
newLayoutSize,
elideTextEnabled,
- isAutoScrollEnabled);
+ isAutoScrollEnabled,
+ ellipsisPosition);
impl.mIsAutoScrollEnabled = isAutoScrollEnabled;
viewUpdated = viewUpdated || (newLayoutSize != layoutSize);
impl.mIsAutoScrollEnabled = isAutoScrollEnabled;
viewUpdated = viewUpdated || (newLayoutSize != layoutSize);