From: Sunghyun Kim Date: Mon, 22 Jun 2020 08:56:20 +0000 (+0900) Subject: [Tizen] Revert the change for 0x0 size of the actor X-Git-Tag: accepted/tizen/unified/20200626.133505~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdaf7044a6a8d28675f2c9826496248a84cbda5a;p=platform%2Fcore%2Fuifw%2Fdali-core.git [Tizen] Revert the change for 0x0 size of the actor This reverts commit 5105c0cf0e64e5e0e1aa5851d69258675e4c975e. Change-Id: I387e24a2f79da5e6961cec62b51103a66cff6080 --- diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp index 65e9ee2..3360635 100644 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -4797,12 +4797,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 ); }