projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bff2dd1
)
Revert "[Tizen] Do not substarct outline width in text-controller"
author
minho.sun
<minho.sun@samsung.com>
Thu, 2 Aug 2018 01:22:25 +0000
(10:22 +0900)
committer
minho.sun
<minho.sun@samsung.com>
Thu, 2 Aug 2018 01:22:25 +0000
(10:22 +0900)
This reverts commit
a4f68627350323829fe34629d1d8510329c5c0e2
.
dali-toolkit/internal/text/text-controller.cpp
patch
|
blob
|
history
diff --git
a/dali-toolkit/internal/text/text-controller.cpp
b/dali-toolkit/internal/text/text-controller.cpp
index
bdb347f
..
4ce4b5a
100755
(executable)
--- a/
dali-toolkit/internal/text/text-controller.cpp
+++ b/
dali-toolkit/internal/text/text-controller.cpp
@@
-3519,7
+3519,8
@@
bool Controller::DoRelayout( const Size& size,
const float outlineWidth = static_cast<float>( mImpl->mModel->GetOutlineWidth() );
// Set the layout parameters.
- Layout::Parameters layoutParameters( size,
+ const Vector2 sizeOffset = Vector2(outlineWidth * 2.0f, outlineWidth * 2.0f); // The outline should be fit into the bounding box
+ Layout::Parameters layoutParameters( size - sizeOffset,
textBuffer,
lineBreakInfo.Begin(),
wordBreakInfo.Begin(),