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

[stage-x11] make get_geometry always get geometry

Browse Source 
Now that we have a minimum size getter on the stage object, change
get_geometry to actually always return the geometry. This fixes stages
that are set as user-resizable appearing at 1x1 size.

This will need changing in other back-ends too.
This commit is contained in:
Chris Lord 2010-02-06 15:34:55 +01:00
parent 27e33aa14f
commit 4887707bb3
1 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
clutter/x11/clutter-stage-x11.c
View File

@ -102,24 +102,20 @@ clutter_stage_x11_fix_window_size (ClutterStageX11 *stage_x11,
if (stage_x11->xwin != None && !stage_x11->is_foreign_xwin) if (stage_x11->xwin != None && !stage_x11->is_foreign_xwin)
{ {
gint min_width, min_height; guint min_width, min_height;
ClutterGeometry min_size;
XSizeHints *size_hints; XSizeHints *size_hints;
size_hints = XAllocSizeHints(); size_hints = XAllocSizeHints();
_clutter_stage_window_get_geometry (CLUTTER_STAGE_WINDOW (stage_x11), clutter_stage_get_minimum_size (stage_x11->wrapper,
&min_size); &min_width,
&min_height);
if (new_width < 0) if (new_width <= 0)
min_width = min_size.width; new_width = min_width;
else
min_width = new_width;
if (new_height < 0) if (new_height <= 0)
min_height = min_size.height; new_height = min_height;
else
min_height = new_height;
size_hints->flags = 0; size_hints->flags = 0;
@ -127,15 +123,19 @@ clutter_stage_x11_fix_window_size (ClutterStageX11 *stage_x11,
restrictions on the window size */ restrictions on the window size */
if (!stage_x11->fullscreen_on_map) if (!stage_x11->fullscreen_on_map)
{ {
size_hints->min_width = min_width; if (resize)
size_hints->min_height = min_height;
size_hints->flags = PMinSize;
if (!resize)
{ {
size_hints->max_width = size_hints->min_width; size_hints->min_width = min_width;
size_hints->max_height = size_hints->min_height; size_hints->min_height = min_height;
size_hints->flags |= PMaxSize; size_hints->flags = PMinSize;
}
else
{
size_hints->min_width = new_width;
size_hints->min_height = new_height;
size_hints->max_width = new_width;
size_hints->max_height = new_height;
size_hints->flags = PMinSize | PMaxSize;
} }
} }
@ -169,7 +169,7 @@ clutter_stage_x11_get_geometry (ClutterStageWindow *stage_window,
ClutterBackend *backend = clutter_get_default_backend (); ClutterBackend *backend = clutter_get_default_backend ();
ClutterBackendX11 *backend_x11; ClutterBackendX11 *backend_x11;
ClutterStageX11 *stage_x11 = CLUTTER_STAGE_X11 (stage_window); ClutterStageX11 *stage_x11 = CLUTTER_STAGE_X11 (stage_window);
gboolean is_fullscreen, resize; gboolean is_fullscreen;
g_return_if_fail (CLUTTER_IS_BACKEND_X11 (backend)); g_return_if_fail (CLUTTER_IS_BACKEND_X11 (backend));
backend_x11 = CLUTTER_BACKEND_X11 (backend); backend_x11 = CLUTTER_BACKEND_X11 (backend);
@ -187,19 +187,8 @@ clutter_stage_x11_get_geometry (ClutterStageWindow *stage_window,
return; return;
} }
resize = clutter_stage_get_user_resizable (stage_x11->wrapper); geometry->width = stage_x11->xwin_width;
geometry->height = stage_x11->xwin_height;
if (resize)
{
clutter_stage_get_minimum_size (stage_x11->wrapper,
&geometry->width,
&geometry->height);
}
else
{
geometry->width = stage_x11->xwin_width;
geometry->height = stage_x11->xwin_height;
}
} }
static void static void