From f4cb9d277d313b7ab2abe904288b8d656f6c027d Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Mon, 8 Jun 2020 18:10:45 +0900 Subject: [PATCH] [Tizen] Revert the change for 0x0 size of the actor This reverts commit 8fe7ddcce0c039ca9131c2b2181e155679fe7155. Change-Id: Ifacca51159d2b629445312dceb40c38e61850e68 --- dali/internal/event/actors/actor-impl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp index ebc19f0..0dc15c9 100644 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -4730,12 +4730,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 || GetResizePolicy( Dimension::WIDTH ) == ResizePolicy::DEFAULT ) + if( size.width > 0.0f ) { SetResizePolicy( ResizePolicy::FIXED, Dimension::WIDTH ); } - if( size.height > 0.0f || GetResizePolicy( Dimension::HEIGHT ) == ResizePolicy::DEFAULT ) + if( size.height > 0.0f ) { SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT ); } -- 2.7.4