[clutter/clutter-1.20] Remove unused internal 'in-resize' flag
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.20] Remove unused internal 'in-resize' flag
- Date: Fri, 15 Aug 2014 11:13:11 +0000 (UTC)
commit f12c174d721f39a19beb782586665d0ce3f6e350
Author: Emmanuele Bassi <ebassi gnome org>
Date: Fri Aug 15 12:07:48 2014 +0100
Remove unused internal 'in-resize' flag
A remnant of days gone by.
clutter/clutter-private.h | 11 ++---------
clutter/gdk/clutter-stage-gdk.c | 3 ---
clutter/x11/clutter-stage-x11.c | 5 -----
3 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h
index c9d406a..bf92626 100644
--- a/clutter/clutter-private.h
+++ b/clutter/clutter-private.h
@@ -70,7 +70,6 @@ typedef struct _ClutterVertex4 ClutterVertex4;
#define CLUTTER_ACTOR_IN_REPARENT(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_REPARENT) != FALSE)
#define CLUTTER_ACTOR_IN_PAINT(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PAINT) != FALSE)
#define CLUTTER_ACTOR_IN_RELAYOUT(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_RELAYOUT) != FALSE)
-#define CLUTTER_STAGE_IN_RESIZE(a) ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_RESIZE) != FALSE)
#define CLUTTER_PARAM_READABLE (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)
#define CLUTTER_PARAM_WRITABLE (G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)
@@ -108,14 +107,8 @@ typedef enum {
/* Used to avoid recursion */
CLUTTER_IN_RELAYOUT = 1 << 4,
- /* Used by the stage if resizing is an asynchronous operation (like on
- * X11) to delay queueing relayouts until we got a notification from the
- * event handling
- */
- CLUTTER_IN_RESIZE = 1 << 5,
-
- /* a flag for internal children of Containers */
- CLUTTER_INTERNAL_CHILD = 1 << 6
+ /* a flag for internal children of Containers (DEPRECATED) */
+ CLUTTER_INTERNAL_CHILD = 1 << 5
} ClutterPrivateFlags;
/*
diff --git a/clutter/gdk/clutter-stage-gdk.c b/clutter/gdk/clutter-stage-gdk.c
index 342906a..06e2403 100644
--- a/clutter/gdk/clutter-stage-gdk.c
+++ b/clutter/gdk/clutter-stage-gdk.c
@@ -143,9 +143,6 @@ clutter_stage_gdk_resize (ClutterStageWindow *stage_window,
CLUTTER_NOTE (BACKEND, "New size received: (%d, %d)", width, height);
- CLUTTER_SET_PRIVATE_FLAGS (CLUTTER_STAGE_COGL (stage_gdk)->wrapper,
- CLUTTER_IN_RESIZE);
-
gdk_window_resize (stage_gdk->window, width, height);
}
diff --git a/clutter/x11/clutter-stage-x11.c b/clutter/x11/clutter-stage-x11.c
index 20fddeb..aecd978 100644
--- a/clutter/x11/clutter-stage-x11.c
+++ b/clutter/x11/clutter-stage-x11.c
@@ -279,9 +279,6 @@ clutter_stage_x11_resize (ClutterStageWindow *stage_window,
width,
height);
- CLUTTER_SET_PRIVATE_FLAGS (stage_cogl->wrapper,
- CLUTTER_IN_RESIZE);
-
/* XXX: in this case we can rely on a subsequent
* ConfigureNotify that will result in the stage
* being reallocated so we don't actively do anything
@@ -1057,8 +1054,6 @@ clutter_stage_x11_translate_event (ClutterEventTranslator *translator,
xevent->xconfigure.width / stage_x11->scale_factor,
xevent->xconfigure.height / stage_x11->scale_factor);
- CLUTTER_UNSET_PRIVATE_FLAGS (stage_cogl->wrapper, CLUTTER_IN_RESIZE);
-
if (size_changed)
{
/* XXX: This is a workaround for a race condition when
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]