[stage-x11] Set the default size differently

We want to set the default size without triggering the layout machinary,
so change the window creation process slightly so we start with a
640x480 window.
This commit is contained in:
Chris Lord 2010-02-07 19:17:43 +01:00
parent b968defae9
commit c82c94e620
3 changed files with 5 additions and 6 deletions

View File

@ -1196,9 +1196,6 @@ clutter_stage_init (ClutterStage *self)
clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE); clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE);
clutter_stage_set_title (self, g_get_prgname ()); clutter_stage_set_title (self, g_get_prgname ());
clutter_stage_set_key_focus (self, NULL); clutter_stage_set_key_focus (self, NULL);
/* Set the default size */
clutter_actor_set_size (CLUTTER_ACTOR (self), 640, 480);
} }
/** /**

View File

@ -171,7 +171,9 @@ clutter_stage_glx_realize (ClutterStageWindow *stage_window)
} }
/* no user resize.. */ /* no user resize.. */
clutter_stage_x11_fix_window_size (stage_x11, -1, -1); clutter_stage_x11_fix_window_size (stage_x11,
stage_x11->xwin_width,
stage_x11->xwin_height);
clutter_stage_x11_set_wm_protocols (stage_x11); clutter_stage_x11_set_wm_protocols (stage_x11);
/* ask for a context; a no-op, if a context already exists */ /* ask for a context; a no-op, if a context already exists */

View File

@ -657,8 +657,8 @@ static void
clutter_stage_x11_init (ClutterStageX11 *stage) clutter_stage_x11_init (ClutterStageX11 *stage)
{ {
stage->xwin = None; stage->xwin = None;
stage->xwin_width = 1; stage->xwin_width = 640;
stage->xwin_height = 1; stage->xwin_height = 480;
stage->wm_state = STAGE_X11_WITHDRAWN; stage->wm_state = STAGE_X11_WITHDRAWN;