From f19a7cddb14f507038e970b6032a54f86d024639 Mon Sep 17 00:00:00 2001 From: Wonsik Jung Date: Tue, 10 Mar 2020 12:47:24 +0900 Subject: [PATCH] [Tizen] Revert the change for 0x0 size of the actor This reverts commit c1c0cff13843946841ed7bdd8e46d8545d70de41. Change-Id: Ice5ee65f7aa7ddecb8d91b5928ded9fd9df22c96 --- 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 4fe30fd..cf4d4ff 100755 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -4655,12 +4655,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