From 57afbf908526aa7e2bb721caef152342cc92c248 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Tue, 7 Nov 2017 16:01:24 +0900 Subject: [PATCH] Fix ImageView OnRelayout and add a commnet in MARGIN property - Removed ImageView Margin implementation. Margin property is to be implemented in the future. Change-Id: I9e1eeea960b7b2a0731f73b8f2a432c0ee5c7649 Signed-off-by: Seoyeon Kim --- dali-toolkit/internal/controls/image-view/image-view-impl.cpp | 8 ++------ dali-toolkit/public-api/controls/control.h | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp index ef122fb..835bb4e 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -262,18 +262,14 @@ void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) if( mVisual ) { - Extents margin; - margin = Self().GetProperty( Toolkit::Control::Property::MARGIN ); - Extents padding; padding = Self().GetProperty( 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 ); diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index 5fd8933..6d2f7e7 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -146,6 +146,7 @@ public: * @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. */ MARGIN, -- 2.7.4