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 remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-label-impl.cpp
diff --git
a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
index
6149e29
..
73f40e9
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@
-401,7
+401,7
@@
void TextLabel::OnInitialize()
// Use height-for-width negotiation by default
self.SetResizePolicy( FILL_TO_PARENT, WIDTH );
// Use height-for-width negotiation by default
self.SetResizePolicy( FILL_TO_PARENT, WIDTH );
- self.Set
DimensionDependency( HEIGHT, WIDTH
);
+ self.Set
ResizePolicy( DIMENSION_DEPENDENCY, HEIGHT
);
}
void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change )
}
void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change )