Revert "[Tizen] Revert the change for 0x0 size of the actor"
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 27 Jul 2020 05:54:17 +0000 (14:54 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 27 Jul 2020 05:54:21 +0000 (14:54 +0900)
This reverts commit ac05b4c89304c39d874cf7a8bd517ee3750234f2.

Change-Id: I5f34cd45e13420e2a2092922e602028212a4390c

dali/internal/event/actors/actor-impl.cpp

index 3360635..65e9ee2 100644 (file)
@@ -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 )
+  if( size.width > 0.0f || GetResizePolicy( Dimension::WIDTH ) == ResizePolicy::DEFAULT )
   {
     SetResizePolicy( ResizePolicy::FIXED, Dimension::WIDTH );
   }
 
-  if( size.height > 0.0f )
+  if( size.height > 0.0f || GetResizePolicy( Dimension::HEIGHT ) == ResizePolicy::DEFAULT )
   {
     SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT );
   }