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 PlaceholderTextColor update issue
[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
062153d
..
4c71934
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-relayouter.cpp
+++ b/
dali-toolkit/internal/text/text-controller-relayouter.cpp
@@
-384,7
+384,7
@@
Controller::UpdateTextType Controller::Relayouter::Relayout(Controller& controll
textUpdateInfo.mCharacterIndex = 0u;
}
textUpdateInfo.mCharacterIndex = 0u;
}
- if(
model->mMatchSystemLanguageDirection &&
impl.mLayoutDirection != layoutDirection)
+ if(impl.mLayoutDirection != layoutDirection)
{
// Clear the update info. This info will be set the next time the text is updated.
textUpdateInfo.mClearAll = true;
{
// Clear the update info. This info will be set the next time the text is updated.
textUpdateInfo.mClearAll = true;
@@
-394,6
+394,7
@@
Controller::UpdateTextType Controller::Relayouter::Relayout(Controller& controll
GET_GLYPH_METRICS |
SHAPE_TEXT |
UPDATE_DIRECTION |
GET_GLYPH_METRICS |
SHAPE_TEXT |
UPDATE_DIRECTION |
+ ALIGN |
LAYOUT |
BIDI_INFO |
REORDER);
LAYOUT |
BIDI_INFO |
REORDER);
@@
-543,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)
{
@@
-569,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);
@@
-622,7
+625,7
@@
bool Controller::Relayouter::DoRelayout(Controller& controller, const Size& size
lines,
impl.mModel->mAlignmentOffset,
impl.mLayoutDirection,
lines,
impl.mModel->mAlignmentOffset,
impl.mLayoutDirection,
-
impl.mModel->mMatchSystemLanguageDirection
);
+
(impl.mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS)
);
viewUpdated = true;
}
viewUpdated = true;
}