summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
8c23ee6)
- Removed ImageView Margin implementation.
Margin property is to be implemented in the future.
Change-Id: I9e1eeea960b7b2a0731f73b8f2a432c0ee5c7649
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
- Extents margin;
- margin = Self().GetProperty<Extents>( Toolkit::Control::Property::MARGIN );
-
Extents padding;
padding = Self().GetProperty<Extents>( Toolkit::Control::Property::PADDING );
Property::Map transformMap = Property::Map();
Extents padding;
padding = Self().GetProperty<Extents>( Toolkit::Control::Property::PADDING );
Property::Map transformMap = Property::Map();
- if( ( padding.start != 0 ) || ( padding.end != 0 ) || ( padding.top != 0 ) || ( padding.bottom != 0 ) ||
- ( margin.start != 0 ) || ( margin.end != 0 ) || ( margin.top != 0 ) || ( margin.bottom != 0 ) )
+ if( ( padding.start != 0 ) || ( padding.end != 0 ) || ( padding.top != 0 ) || ( padding.bottom != 0 ) )
- transformMap.Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2( margin.start + padding.start, margin.top + padding.top ) )
+ transformMap.Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2( padding.start, padding.top ) )
.Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) )
.Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN )
.Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::TOP_BEGIN );
.Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) )
.Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN )
.Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::TOP_BEGIN );
* @brief The outer space around the control.
* @details Name "margin", type Property::EXTENTS.
* @SINCE_1_2.62
* @brief The outer space around the control.
* @details Name "margin", type Property::EXTENTS.
* @SINCE_1_2.62
+ * @note Margin property is to be supported by Layout algorithms and containers in future.