From 9997404c5ba8c1fecb67ab8151730bdbe2f4261f Mon Sep 17 00:00:00 2001 From: Jiyun Yang Date: Wed, 22 Apr 2020 15:02:16 +0900 Subject: [PATCH] [Tizen] Revert the change for 0x0 size of the actor Change-Id: I8316c5d0ddc96e1cffffdb64a7624e7d87954c73 --- dali/internal/event/actors/actor-impl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp index ae02f5d..2065436 100644 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -4697,12 +4697,12 @@ void Actor::SetPreferredSize( const Vector2& size ) // A 0 width or height may also be required so if the resize policy has not been changed, i.e. is still set to DEFAULT, // then change to FIXED as well - if( size.width > 0.0f || GetResizePolicy( Dimension::WIDTH ) == ResizePolicy::DEFAULT ) + if( size.width > 0.0f ) { SetResizePolicy( ResizePolicy::FIXED, Dimension::WIDTH ); } - if( size.height > 0.0f || GetResizePolicy( Dimension::HEIGHT ) == ResizePolicy::DEFAULT ) + if( size.height > 0.0f ) { SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT ); } -- 2.7.4