From: Sunghyun Kim <scholb.kim@samsung.com>
Date: Tue, 7 Apr 2020 01:00:15 +0000 (+0900)
Subject: Revert "[Tizen] Revert the change for 0x0 size of the actor"
X-Git-Tag: accepted/tizen/unified/20200409.083644~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07a8c1ac04cd3d69d1de6ae4b2c86d04255f07f1;p=platform%2Fcore%2Fuifw%2Fdali-core.git

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

This reverts commit bc727f93ba6202f65340efbb3628acd6580d8f7b.

Change-Id: I2e7ee34dd185a67b148894081f45c56e96ece831
---

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