projects
/
platform
/
core
/
uifw
/
dali-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0b3c34f
)
Revert "[Tizen] Revert the change for 0x0 size of the actor"
author
neostom432
<minho.sun@samsung.com>
Mon, 23 Mar 2020 09:23:41 +0000
(18:23 +0900)
committer
neostom432
<minho.sun@samsung.com>
Mon, 23 Mar 2020 09:23:41 +0000
(18:23 +0900)
This reverts commit
f19a7cddb14f507038e970b6032a54f86d024639
.
dali/internal/event/actors/actor-impl.cpp
patch
|
blob
|
history
diff --git
a/dali/internal/event/actors/actor-impl.cpp
b/dali/internal/event/actors/actor-impl.cpp
index
cf4d4ff
..
4fe30fd
100755
(executable)
--- 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
// 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 );
}
{
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 );
}
{
SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT );
}