Revert "[Tizen] Revert the change for 0x0 size of the actor"
authorneostom432 <minho.sun@samsung.com>
Mon, 15 Jun 2020 17:03:31 +0000 (02:03 +0900)
committerneostom432 <minho.sun@samsung.com>
Mon, 15 Jun 2020 17:03:31 +0000 (02:03 +0900)
This reverts commit 0d7362eb75780063eac6965e8379e43de1a81031.

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

index 7835e7fbd367b240be16a37c297bce9dae0bbaf8..4dfa789f976a2ddc286847cea75596b8fd31521d 100644 (file)
@@ -4704,12 +4704,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 );
   }