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
[dali_2.1.26] Merge branch 'devel/master'
[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
3e4c9c8
..
b9b4f56
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-relayouter.cpp
+++ b/
dali-toolkit/internal/text/text-controller-relayouter.cpp
@@
-93,6
+93,12
@@
Size Controller::Relayouter::CalculateLayoutSizeOnRequiredControllerSize(Control
{
impl.UpdateModel(onlyOnceOperations);
{
impl.UpdateModel(onlyOnceOperations);
+ if(impl.mIsAutoScrollEnabled)
+ {
+ // Layout the text for the new width.
+ operationsPending = static_cast<OperationsMask>(operationsPending | requestedOperationsMask);
+ }
+
DoRelayout(impl,
requestedControllerSize,
static_cast<OperationsMask>(onlyOnceOperations | requestedOperationsMask),
DoRelayout(impl,
requestedControllerSize,
static_cast<OperationsMask>(onlyOnceOperations | requestedOperationsMask),
@@
-619,12
+625,15
@@
bool Controller::Relayouter::DoRelayout(Controller::Impl& impl, const Size& size
}
// Update the visual model.
}
// Update the visual model.
- bool isAutoScrollEnabled = impl.mIsAutoScrollEnabled;
+ bool isAutoScrollEnabled = impl.mIsAutoScrollEnabled;
+ bool isAutoScrollMaxTextureExceeded = impl.mIsAutoScrollMaxTextureExceeded;
+
Size newLayoutSize;
viewUpdated = impl.mLayoutEngine.LayoutText(layoutParameters,
newLayoutSize,
elideTextEnabled,
isAutoScrollEnabled,
Size newLayoutSize;
viewUpdated = impl.mLayoutEngine.LayoutText(layoutParameters,
newLayoutSize,
elideTextEnabled,
isAutoScrollEnabled,
+ isAutoScrollMaxTextureExceeded,
ellipsisPosition);
impl.mIsAutoScrollEnabled = isAutoScrollEnabled;
ellipsisPosition);
impl.mIsAutoScrollEnabled = isAutoScrollEnabled;