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 "fix ellipsis not working issue when the given width is too narrow" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
page-turn-view
/
page-turn-portrait-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp
b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp
index
b4bc45a
..
d4566bf
100644
(file)
--- a/
dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp
@@
-78,7
+78,7
@@
void PageTurnPortraitView::OnPageTurnViewInitialize()
mSpineEffectShader.RegisterProperty(PROPERTY_TEXTURE_WIDTH, 1.f );
mControlSize = mPageSize;
mSpineEffectShader.RegisterProperty(PROPERTY_TEXTURE_WIDTH, 1.f );
mControlSize = mPageSize;
- Self().Set
Size(
mPageSize );
+ Self().Set
Property( Actor::Property::SIZE,
mPageSize );
mTurningPageLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT );
}
mTurningPageLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT );
}