Peter M. Groen / dali-demo

Commit c45e7700fa93d568dff9e31be4efdc0e1bc5845d

Authored by Eunki, Hong
1 parent 5afa6ec0

Fix demo app s.t. don't use z=0 scale 

If we use LAYER_UI, z=0 scale can make various bugs.
Let we resolve that kind of bugs.

Change-Id: Iba39cf09202be3ed30cef8656f8dae2e090eaabd
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
examples/inherit-test/inherit-test-example.cpp
  View file @c45e770
@@ -216,9 +216,9 @@ public: @@ -216,9 +216,9 @@ public:
216 mParent.SetBackgroundColor(Color::BLUE); 216 mParent.SetBackgroundColor(Color::BLUE);
217 mParent.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); 217 mParent.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
218 mParent.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); 218 mParent.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
219 - mParent.SetProperty(Actor::Property::SIZE, parentViewSize); 219 + mParent.SetProperty(Actor::Property::SIZE, Vector3(parentViewSize));
220 mParent.SetProperty(Actor::Property::POSITION, Vector3::ZERO); 220 mParent.SetProperty(Actor::Property::POSITION, Vector3::ZERO);
221 - mParent.SetProperty(Actor::Property::SCALE, parentViewScale); 221 + mParent.SetProperty(Actor::Property::SCALE, Vector3(parentViewScale.x, parentViewScale.y, 1.0f));
222 222
223 Vector3 parentOrigin = PARENT_ORIGIN_LIST[mParentOriginIndex]; 223 Vector3 parentOrigin = PARENT_ORIGIN_LIST[mParentOriginIndex];
224 Vector3 anchorPoint = ANCHOR_POINT_LIST[mAnchorPointIndex]; 224 Vector3 anchorPoint = ANCHOR_POINT_LIST[mAnchorPointIndex];
@@ -234,9 +234,9 @@ public: @@ -234,9 +234,9 @@ public:
234 mCurrent.SetBackgroundColor(Color::RED); 234 mCurrent.SetBackgroundColor(Color::RED);
235 mCurrent.SetProperty(Actor::Property::PARENT_ORIGIN, parentOrigin); 235 mCurrent.SetProperty(Actor::Property::PARENT_ORIGIN, parentOrigin);
236 mCurrent.SetProperty(Actor::Property::ANCHOR_POINT, anchorPoint); 236 mCurrent.SetProperty(Actor::Property::ANCHOR_POINT, anchorPoint);
237 - mCurrent.SetProperty(Actor::Property::SIZE, currentViewSize);  
238 - mCurrent.SetProperty(Actor::Property::POSITION, currentViewPosition);  
239 - mCurrent.SetProperty(Actor::Property::SCALE, currentViewScale); 237 + mCurrent.SetProperty(Actor::Property::SIZE, Vector3(currentViewSize));
  238 + mCurrent.SetProperty(Actor::Property::POSITION, Vector3(currentViewPosition));
  239 + mCurrent.SetProperty(Actor::Property::SCALE, Vector3(currentViewScale.x, currentViewScale.y, 1.0f));
240 240
241 mCurrent.SetProperty(Actor::Property::INHERIT_POSITION, inheritPosition); 241 mCurrent.SetProperty(Actor::Property::INHERIT_POSITION, inheritPosition);
242 mCurrent.SetProperty(Actor::Property::INHERIT_SCALE, inheritScale); 242 mCurrent.SetProperty(Actor::Property::INHERIT_SCALE, inheritScale);