From aef6fc5f61779702c47cbe8f79c731ff166adb83 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 16 Jun 2008 13:38:46 +0000 Subject: [PATCH] 2008-06-16 Emmanuele Bassi * clutter/eglnative/clutter-stage-egl.c: Ignore any size allocation we receive from the user. * clutter/fruity/clutter-stage-fruity.c: Ditto as above. --- ChangeLog | 7 +++++++ clutter/eglnative/clutter-stage-egl.c | 12 ++++++++++++ clutter/fruity/clutter-stage-fruity.c | 12 ++++++++++++ 3 files changed, 31 insertions(+) diff --git a/ChangeLog b/ChangeLog index de741e185..5ecf381c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-16 Emmanuele Bassi + + * clutter/eglnative/clutter-stage-egl.c: Ignore any size allocation + we receive from the user. + + * clutter/fruity/clutter-stage-fruity.c: Ditto as above. + 2008-06-16 Tomas Frydrych * clutter/clutter-actor.c: diff --git a/clutter/eglnative/clutter-stage-egl.c b/clutter/eglnative/clutter-stage-egl.c index 13a30c5c1..033dafaf2 100644 --- a/clutter/eglnative/clutter-stage-egl.c +++ b/clutter/eglnative/clutter-stage-egl.c @@ -233,6 +233,17 @@ clutter_stage_egl_get_preferred_height (ClutterActor *self, *natural_height_p = CLUTTER_UNITS_FROM_DEVICE (stage_egl->surface_height); } +static void +clutter_stage_egl_allocate (ClutterActor *self, + const ClutterActorBox *box, + gboolean origin_changed) +{ + /* we cannot resize the frame buffer, so we just ignore + * any allocation we receive by simply interrupting the + * allocation chain. + */ +} + static void clutter_stage_egl_dispose (GObject *gobject) { @@ -257,6 +268,7 @@ clutter_stage_egl_class_init (ClutterStageEGLClass *klass) actor_class->unrealize = clutter_stage_egl_unrealize; actor_class->get_preferred_width = clutter_stage_egl_get_preferred_width; actor_class->get_preferred_height = clutter_stage_egl_get_preferred_height; + actor_class->allocate = clutter_stage_egl_allocate; } static void diff --git a/clutter/fruity/clutter-stage-fruity.c b/clutter/fruity/clutter-stage-fruity.c index ed603a375..64ee5497d 100644 --- a/clutter/fruity/clutter-stage-fruity.c +++ b/clutter/fruity/clutter-stage-fruity.c @@ -217,6 +217,17 @@ clutter_stage_egl_get_preferred_height (ClutterActor *self, *natural_height_p = CLUTTER_UNITS_FROM_DEVICE (stage_egl->surface_height); } +static void +clutter_stage_egl_allocate (ClutterActor *self, + const ClutterActorBox *box, + gboolean origin_changed) +{ + /* we cannot resize the frame buffer, so we just ignore + * any allocation we receive by simply interrupting the + * allocation chain. + */ +} + static void clutter_stage_egl_dispose (GObject *gobject) { @@ -241,6 +252,7 @@ clutter_stage_egl_class_init (ClutterStageEGLClass *klass) actor_class->unrealize = clutter_stage_egl_unrealize; actor_class->get_preferred_width = clutter_stage_egl_get_preferred_width; actor_class->get_preferred_height = clutter_stage_egl_get_preferred_height; + actor_class->allocate = clutter_stage_egl_allocate; } static void