From: Wonsik Jung Date: Tue, 10 Mar 2020 03:47:24 +0000 (+0900) Subject: [Tizen] Revert the change for 0x0 size of the actor X-Git-Tag: submit/tizen/20200310.042640^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=commitdiff_plain;h=f19a7cddb14f507038e970b6032a54f86d024639 [Tizen] Revert the change for 0x0 size of the actor This reverts commit c1c0cff13843946841ed7bdd8e46d8545d70de41. Change-Id: Ice5ee65f7aa7ddecb8d91b5928ded9fd9df22c96 --- diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp index 4fe30fd..cf4d4ff 100755 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -4655,12 +4655,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 ); }