Revert "[Tizen] Revert the change for 0x0 size of the actor"
authorWonsik Jung <sidein@samsung.com>
Tue, 2 Jun 2020 07:17:56 +0000 (16:17 +0900)
committerWonsik Jung <sidein@samsung.com>
Tue, 2 Jun 2020 07:17:56 +0000 (16:17 +0900)
This reverts commit fa0a8b8d8b8d7a74349b129a0e654c68c06366ec.

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 );
   }