isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-28 04:19:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused internal 'in-resize' flag

Browse Source 
A remnant of days gone by.
This commit is contained in:
Emmanuele Bassi 2014-08-15 12:07:48 +01:00
parent 398a7ac713
commit f12c174d72
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/clutter-private.h
View File

@ -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_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_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_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_READABLE (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)
#define CLUTTER_PARAM_WRITABLE (G_PARAM_WRITABLE | 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 */ /* Used to avoid recursion */
CLUTTER_IN_RELAYOUT = 1 << 4, CLUTTER_IN_RELAYOUT = 1 << 4,
/* Used by the stage if resizing is an asynchronous operation (like on /* a flag for internal children of Containers (DEPRECATED) */
* X11) to delay queueing relayouts until we got a notification from the CLUTTER_INTERNAL_CHILD = 1 << 5
* event handling
*/
CLUTTER_IN_RESIZE = 1 << 5,
/* a flag for internal children of Containers */
CLUTTER_INTERNAL_CHILD = 1 << 6
} ClutterPrivateFlags; } ClutterPrivateFlags;
/* /*

3
clutter/gdk/clutter-stage-gdk.c
View File

@ -143,9 +143,6 @@ clutter_stage_gdk_resize (ClutterStageWindow *stage_window,
CLUTTER_NOTE (BACKEND, "New size received: (%d, %d)", width, height); 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); gdk_window_resize (stage_gdk->window, width, height);
} }

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

@ -279,9 +279,6 @@ clutter_stage_x11_resize (ClutterStageWindow *stage_window,
width, width,
height); height);
CLUTTER_SET_PRIVATE_FLAGS (stage_cogl->wrapper,
CLUTTER_IN_RESIZE);
/* XXX: in this case we can rely on a subsequent /* XXX: in this case we can rely on a subsequent
* ConfigureNotify that will result in the stage * ConfigureNotify that will result in the stage
* being reallocated so we don't actively do anything * 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.width / stage_x11->scale_factor,
xevent->xconfigure.height / stage_x11->scale_factor); xevent->xconfigure.height / stage_x11->scale_factor);
CLUTTER_UNSET_PRIVATE_FLAGS (stage_cogl->wrapper, CLUTTER_IN_RESIZE);
if (size_changed) if (size_changed)
{ {
/* XXX: This is a workaround for a race condition when /* XXX: This is a workaround for a race condition when