From 07a8c1ac04cd3d69d1de6ae4b2c86d04255f07f1 Mon Sep 17 00:00:00 2001 From: Sunghyun Kim Date: Tue, 7 Apr 2020 10:00:15 +0900 Subject: [PATCH] Revert "[Tizen] Revert the change for 0x0 size of the actor" This reverts commit bc727f93ba6202f65340efbb3628acd6580d8f7b. Change-Id: I2e7ee34dd185a67b148894081f45c56e96ece831 --- 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 8fd938e..ed576d1 100644 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -4642,12 +4642,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