From 8083dc418b3c2b069a9b0db9323650050a3f63b1 Mon Sep 17 00:00:00 2001 From: Chris Lord Date: Sat, 6 Feb 2010 16:57:37 +0100 Subject: [PATCH] Revert "[x11] Don't set actor size on ConfigureNotify" This reverts commit 29cc027f069c9ad900b9044cd40075c2d17be736. I misunderstood the problem, this commit breaks resizes coming from outside of Clutter. --- clutter/x11/clutter-event-x11.c | 4 ++++ clutter/x11/clutter-stage-x11.c | 5 +---- clutter/x11/clutter-stage-x11.h | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clutter/x11/clutter-event-x11.c b/clutter/x11/clutter-event-x11.c index 4645b63..1a3a260 100644 --- a/clutter/x11/clutter-event-x11.c +++ b/clutter/x11/clutter-event-x11.c @@ -485,6 +485,10 @@ event_translate (ClutterBackend *backend, xevent->xconfigure.width, xevent->xconfigure.height); + clutter_actor_set_size (CLUTTER_ACTOR (stage), + xevent->xconfigure.width, + xevent->xconfigure.height); + CLUTTER_UNSET_PRIVATE_FLAGS (stage_x11->wrapper, CLUTTER_STAGE_IN_RESIZE); diff --git a/clutter/x11/clutter-stage-x11.c b/clutter/x11/clutter-stage-x11.c index f0d57bd..754dcc2 100644 --- a/clutter/x11/clutter-stage-x11.c +++ b/clutter/x11/clutter-stage-x11.c @@ -220,12 +220,10 @@ clutter_stage_x11_resize (ClutterStageWindow *stage_window, CLUTTER_NOTE (BACKEND, "New size received: (%d, %d)", width, height); if (width != stage_x11->xwin_width || - height != stage_x11->xwin_height || - stage_x11->first_allocation) + height != stage_x11->xwin_height) { stage_x11->xwin_width = width; stage_x11->xwin_height = height; - stage_x11->first_allocation = FALSE; if (stage_x11->xwin != None && !stage_x11->is_foreign_xwin) { @@ -661,7 +659,6 @@ clutter_stage_x11_init (ClutterStageX11 *stage) stage->xwin = None; stage->xwin_width = 640; stage->xwin_height = 480; - stage->first_allocation = TRUE; stage->wm_state = STAGE_X11_WITHDRAWN; diff --git a/clutter/x11/clutter-stage-x11.h b/clutter/x11/clutter-stage-x11.h index a10c0d9..71b66e3 100644 --- a/clutter/x11/clutter-stage-x11.h +++ b/clutter/x11/clutter-stage-x11.h @@ -54,7 +54,6 @@ struct _ClutterStageX11 guint fullscreen_on_map : 1; guint is_cursor_visible : 1; guint viewport_initialized : 1; - guint first_allocation : 1; Window xwin; gint xwin_width; -- 2.7.4