brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

actor: Use the TOPLEVEL flag instead of a type check

Browse Source 
We can use the internal private CLUTTER_ACTOR_IS_TOPLEVEL flag, which is
set only on Stages.
This commit is contained in:
Emmanuele Bassi 2010-02-27 18:24:17 +00:00
parent cd62dfbd14
commit 52ba9a1800
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clutter/clutter-actor.c
View File

@ -5477,14 +5477,21 @@ clutter_actor_set_width_internal (ClutterActor *self,
{ {
if (width >= 0) if (width >= 0)
{ {
if (!CLUTTER_IS_STAGE (self)) /* the Stage will use the :min-width to control the minimum
* width to be resized to, so we should not be setting it
* along with the :natural-width
*/
if (!(CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL))
clutter_actor_set_min_width (self, width); clutter_actor_set_min_width (self, width);
clutter_actor_set_natural_width (self, width); clutter_actor_set_natural_width (self, width);
} }
else else
{ {
if (!CLUTTER_IS_STAGE (self)) /* we only unset the :natural-width for the Stage */
if (!(CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL))
clutter_actor_set_min_width_set (self, FALSE); clutter_actor_set_min_width_set (self, FALSE);
clutter_actor_set_natural_width_set (self, FALSE); clutter_actor_set_natural_width_set (self, FALSE);
} }
} }
@ -5498,14 +5505,18 @@ clutter_actor_set_height_internal (ClutterActor *self,
{ {
if (height >= 0) if (height >= 0)
{ {
if (!CLUTTER_IS_STAGE (self)) /* see the comment above in set_width_internal() */
if (!(CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL))
clutter_actor_set_min_height (self, height); clutter_actor_set_min_height (self, height);
clutter_actor_set_natural_height (self, height); clutter_actor_set_natural_height (self, height);
} }
else else
{ {
if (!CLUTTER_IS_STAGE (self)) /* see the comment above in set_width_internal() */
if (!(CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IS_TOPLEVEL))
clutter_actor_set_min_height_set (self, FALSE); clutter_actor_set_min_height_set (self, FALSE);
clutter_actor_set_natural_height_set (self, FALSE); clutter_actor_set_natural_height_set (self, FALSE);
} }
} }