From: Seungho, Baek <sbsh.baek@samsung.com>
Date: Tue, 14 Jul 2020 07:57:37 +0000 (+0900)
Subject: Revert "[Tizen] Revert the change for 0x0 size of the actor"
X-Git-Tag: accepted/tizen/unified/20200715.002034~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a9c209156116028e7389d88768191a2a15ac278;hp=1727e101c71cb8e21234089fe02a2d590824a5e4;p=platform%2Fcore%2Fuifw%2Fdali-core.git

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

This reverts commit bdaf7044a6a8d28675f2c9826496248a84cbda5a.
---

diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp
index 3360635..65e9ee2 100644
--- a/dali/internal/event/actors/actor-impl.cpp
+++ b/dali/internal/event/actors/actor-impl.cpp
@@ -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 );
   }