From de226c8d3991ce0abb13ec4fab91ebd7820e26b0 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Mon, 13 Apr 2020 16:40:00 +0900 Subject: [PATCH] [Tizen] Revert the change for 0x0 size of the actor This reverts commit a67d0b62e860d9463155912e58ba8d683b7ffc25. Change-Id: I05eb4f0be5e29187ca59145e7e54208e23dad4c8 --- 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 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 ); } -- 2.7.4