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
Further Setter/Getter public API removal from Dali::Actor
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control-impl.cpp
diff --git
a/dali-toolkit/public-api/controls/control-impl.cpp
b/dali-toolkit/public-api/controls/control-impl.cpp
index
1be8bd6
..
ba1fd7f
100755
(executable)
--- a/
dali-toolkit/public-api/controls/control-impl.cpp
+++ b/
dali-toolkit/public-api/controls/control-impl.cpp
@@
-504,7
+504,7
@@
void Control::OnPinch(const PinchGesture& pinch)
*( mImpl->mStartingPinchScale ) = Self().GetCurrentProperty< Vector3 >( Actor::Property::SCALE );
}
*( mImpl->mStartingPinchScale ) = Self().GetCurrentProperty< Vector3 >( Actor::Property::SCALE );
}
- Self().Set
Scale(
*( mImpl->mStartingPinchScale ) * pinch.scale );
+ Self().Set
Property( Actor::Property::SCALE,
*( mImpl->mStartingPinchScale ) * pinch.scale );
}
void Control::OnPan( const PanGesture& pan )
}
void Control::OnPan( const PanGesture& pan )
@@
-668,7
+668,7
@@
void Control::OnRelayout( const Vector2& size, RelayoutContainer& container )
childOffset.x += ( mImpl->mMargin.start + padding.start );
childOffset.y += ( mImpl->mMargin.top + padding.top );
childOffset.x += ( mImpl->mMargin.start + padding.start );
childOffset.y += ( mImpl->mMargin.top + padding.top );
- child.SetP
osition( childOffset.x, childOffset.y
);
+ child.SetP
roperty( Actor::Property::POSITION, Vector2( childOffset.x, childOffset.y )
);
}
container.Add( child, newChildSize );
}
}
container.Add( child, newChildSize );
}