From: Sunghyun Kim Date: Tue, 7 Apr 2020 01:02:04 +0000 (+0900) Subject: [Tizen] Revert the change for 0x0 size of the actor X-Git-Tag: accepted/tizen/unified/20200409.083644~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1526e88b8690366ec8c6458aade0ba331b9a79db;p=platform%2Fcore%2Fuifw%2Fdali-core.git [Tizen] Revert the change for 0x0 size of the actor This reverts commit 07a8c1ac04cd3d69d1de6ae4b2c86d04255f07f1. Change-Id: I64e91acfd30a744a8b545021c6587f771d64e145 --- diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp index ae02f5d..2065436 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 || 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 ); }