Revert "[Tizen] Revert the change for 0x0 size of the actor"
authorJoogab Yun <joogab.yun@samsung.com>
Tue, 18 Aug 2020 07:05:58 +0000 (16:05 +0900)
committerJoogab Yun <joogab.yun@samsung.com>
Tue, 18 Aug 2020 07:05:58 +0000 (16:05 +0900)
This reverts commit a05b740b705e3626869e7fa786b15e64807c509a.

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

index 3c40d831c520e0a4a2a0ceceb09dac620444105d..6c63b25447a6792c7114fdb2fb0ee03ad227848a 100755 (executable)
@@ -4815,12 +4815,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 );
   }