Revert "[Tizen] Revert the change for 0x0 size of the actor"
authorDaekwang Ryu <dkdk.ryu@samsung.com>
Tue, 21 Jul 2020 05:13:46 +0000 (14:13 +0900)
committerDaekwang Ryu <dkdk.ryu@samsung.com>
Tue, 21 Jul 2020 05:13:46 +0000 (14:13 +0900)
This reverts commit e02998646734ba4066b2172c5f8dde5984f71a7d.

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

index 3360635..65e9ee2 100644 (file)
@@ -4797,12 +4797,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 );
   }