isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 08:30:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

[stage] Now that get_geometry works, use it

Browse Source 
We want the actual window geometry in clutter_stage_set_minimum_size,
not the set size. Now that the geometry function has been changed to do
what it says, use it.
This commit is contained in:
Chris Lord 2010-02-06 15:41:01 +01:00
parent 4887707bb3
commit cea9de7f04
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clutter/clutter-stage.c
View File

@ -2344,7 +2344,7 @@ clutter_stage_set_minimum_size (ClutterStage *stage,
guint height) guint height)
{ {
gboolean resize; gboolean resize;
gfloat current_width, current_height; ClutterGeometry geom;
g_return_if_fail (CLUTTER_IS_STAGE (stage)); g_return_if_fail (CLUTTER_IS_STAGE (stage));
g_return_if_fail ((width > 0) && (height > 0)); g_return_if_fail ((width > 0) && (height > 0));
@ -2356,19 +2356,17 @@ clutter_stage_set_minimum_size (ClutterStage *stage,
return; return;
resize = FALSE; resize = FALSE;
clutter_actor_get_size (CLUTTER_ACTOR (stage), _clutter_stage_window_get_geometry (stage->priv->impl, &geom);
&current_width,
&current_height);
if ((guint)current_width < width) if (geom.width < width)
resize = TRUE; resize = TRUE;
else else
width = (guint)current_width; width = geom.width;
if ((guint)current_height < height) if (geom.height < height)
resize = TRUE; resize = TRUE;
else else
height = (guint)current_height; height = geom.height;
if (resize) if (resize)
_clutter_stage_window_resize (stage->priv->impl, width, height); _clutter_stage_window_resize (stage->priv->impl, width, height);