From 3a9c209156116028e7389d88768191a2a15ac278 Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Tue, 14 Jul 2020 16:57:37 +0900 Subject: [PATCH 1/1] Revert "[Tizen] Revert the change for 0x0 size of the actor" This reverts commit bdaf7044a6a8d28675f2c9826496248a84cbda5a. --- 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 3360635..65e9ee2 100644 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -4797,12 +4797,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 ); } -- 2.7.4