From: Seungho, Baek <sbsh.baek@samsung.com>
Date: Tue, 14 Jul 2020 09:43:17 +0000 (+0900)
Subject: Revert "[Tizen] Revert the change for 0x0 size of the actor"
X-Git-Tag: accepted/tizen/unified/20200715.002029~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b24ff76d48a47400b807599f8ee01e4269f89d61;p=platform%2Fcore%2Fuifw%2Fdali-core-legacy.git

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

This reverts commit a6700cd65d8873b746483d6f920169ff8e152938.
---

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