Revert "[Tizen] Revert the change for 0x0 size of the actor" accepted/tizen/unified/20200826.133117 submit/tizen/20200825.050532
authorJoogab Yun <joogab.yun@samsung.com>
Mon, 24 Aug 2020 07:21:58 +0000 (16:21 +0900)
committerJoogab Yun <joogab.yun@samsung.com>
Mon, 24 Aug 2020 07:22:03 +0000 (16:22 +0900)
This reverts commit b38eee11b1432b6a17b09c9865411f47acaea327.

Change-Id: I4a68bc3652d47ba00273635bf7e2138c22ef4d1f

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

index 61322d6..30cdbd8 100755 (executable)
@@ -4791,12 +4791,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 );
   }