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 "Makes the LTR/RTL alignment of text follow the system language by default...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-impl.cpp
diff --git
a/dali-toolkit/internal/text/text-controller-impl.cpp
b/dali-toolkit/internal/text/text-controller-impl.cpp
index
76ba060
..
279f23b
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/
dali-toolkit/internal/text/text-controller-impl.cpp
@@
-797,7
+797,7
@@
bool Controller::Impl::UpdateModel(OperationsMask operationsRequired)
startIndex,
requestedNumberOfCharacters,
bidirectionalInfo,
startIndex,
requestedNumberOfCharacters,
bidirectionalInfo,
-
mModel->mMatchSystemLanguageDirection
,
+
(mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS)
,
mLayoutDirection);
if(0u != bidirectionalInfo.Count())
mLayoutDirection);
if(0u != bidirectionalInfo.Count())
@@
-1737,7
+1737,7
@@
void Controller::Impl::GetCursorPosition(CharacterIndex logical,
cursorInfo.primaryCursorHeight = cursorInfo.lineHeight;
bool isRTL = false;
cursorInfo.primaryCursorHeight = cursorInfo.lineHeight;
bool isRTL = false;
- if(mModel->mMatch
SystemLanguageDirection
)
+ if(mModel->mMatch
LayoutDirection != DevelText::MatchLayoutDirection::CONTENTS
)
{
isRTL = mLayoutDirection == LayoutDirection::RIGHT_TO_LEFT;
}
{
isRTL = mLayoutDirection == LayoutDirection::RIGHT_TO_LEFT;
}