From: Wonsik Jung <sidein@samsung.com>
Date: Tue, 2 Jun 2020 07:17:56 +0000 (+0900)
Subject: Revert "[Tizen] Revert the change for 0x0 size of the actor"
X-Git-Tag: accepted/tizen/unified/20200603.150037~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df3b469e7e6e6897dcc155d91c90a0b9e8d6c937;p=platform%2Fcore%2Fuifw%2Fdali-core-legacy.git

Revert "[Tizen] Revert the change for 0x0 size of the actor"

This reverts commit fa0a8b8d8b8d7a74349b129a0e654c68c06366ec.
---

diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp
index 2065436..ae02f5d 100644
--- a/dali/internal/event/actors/actor-impl.cpp
+++ b/dali/internal/event/actors/actor-impl.cpp
@@ -4697,12 +4697,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 );
   }