Revert "[Tizen] Revert the change for 0x0 size of the actor"
authorWonsik Jung <sidein@samsung.com>
Mon, 10 Aug 2020 05:28:13 +0000 (14:28 +0900)
committerWonsik Jung <sidein@samsung.com>
Mon, 10 Aug 2020 05:28:13 +0000 (14:28 +0900)
This reverts commit 5ead590a18cc969ecad12cea4a0e72a85d9482d2.

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

index f33be18..85d6034 100644 (file)
@@ -4814,12 +4814,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 );
   }