Revert "[Tizen] Revert the change for 0x0 size of the actor"
authorneostom432 <minho.sun@samsung.com>
Mon, 15 Jun 2020 16:27:09 +0000 (01:27 +0900)
committerneostom432 <minho.sun@samsung.com>
Mon, 15 Jun 2020 16:27:09 +0000 (01:27 +0900)
This reverts commit f4cb9d277d313b7ab2abe904288b8d656f6c027d.

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

index 0dc15c9..ebc19f0 100644 (file)
@@ -4730,12 +4730,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 );
   }