From: Heeyong Song <heeyong.song@samsung.com>
Date: Thu, 28 May 2020 05:03:21 +0000 (+0900)
Subject: Revert "[Tizen] Revert the change for 0x0 size of the actor"
X-Git-Tag: accepted/tizen/unified/20200529.124241~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=841adf35de94040a30be8a1387f3592266e2de49;p=platform%2Fcore%2Fuifw%2Fdali-core.git

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

This reverts commit 59eb86e4c37d7629e2a8a87a03897648ec0b3f3d.

Change-Id: I1f61b6313cdc13603989f9302675f39564da8ebf
---

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 );
   }