Revert "[Tizen] Revert the change for 0x0 size of the actor"
authorHeeyong Song <heeyong.song@samsung.com>
Wed, 6 May 2020 09:08:01 +0000 (18:08 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Wed, 6 May 2020 09:08:04 +0000 (18:08 +0900)
This reverts commit 9e83d1529161752ea2d9ab54078d58596ba7f594.

Change-Id: I29241ab1c06135d0f5424750914b9f979a144c4b

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

index 2065436..ae02f5d 100644 (file)
@@ -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 )
+  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 );
   }