mirror of
https://github.com/brl/mutter.git
synced 2025-06-14 01:09:30 +00:00
Merge branch 'internal-flag' into ebassi-next
* internal-flag: conform: Add test unit for the destruction of Containers actor: Add internal child flag Clean up whitespace, indentation and comments
This commit is contained in:
@ -58,13 +58,26 @@ typedef enum {
|
||||
CLUTTER_ACTOR_IN_DESTRUCTION = 1 << 0,
|
||||
CLUTTER_ACTOR_IS_TOPLEVEL = 1 << 1,
|
||||
CLUTTER_ACTOR_IN_REPARENT = 1 << 2,
|
||||
CLUTTER_ACTOR_SYNC_MATRICES = 1 << 3, /* Used by stage to indicate GL
|
||||
* viewport / perspective etc
|
||||
* needs (re)setting.
|
||||
*/
|
||||
CLUTTER_ACTOR_IN_PAINT = 1 << 4, /* Used to avoid recursion */
|
||||
CLUTTER_ACTOR_IN_RELAYOUT = 1 << 5, /* Used to avoid recursion */
|
||||
CLUTTER_STAGE_IN_RESIZE = 1 << 6
|
||||
|
||||
/* Used by the stage to indicate GL viewport / perspective etc needs
|
||||
* (re)setting.
|
||||
*/
|
||||
CLUTTER_ACTOR_SYNC_MATRICES = 1 << 3,
|
||||
|
||||
/* Used to avoid recursion */
|
||||
CLUTTER_ACTOR_IN_PAINT = 1 << 4,
|
||||
|
||||
/* Used to avoid recursion */
|
||||
CLUTTER_ACTOR_IN_RELAYOUT = 1 << 5,
|
||||
|
||||
/* 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_STAGE_IN_RESIZE = 1 << 6,
|
||||
|
||||
/* a flag for internal children of Containers */
|
||||
CLUTTER_ACTOR_INTERNAL_CHILD = 1 << 7
|
||||
} ClutterPrivateFlags;
|
||||
|
||||
struct _ClutterInputDevice
|
||||
@ -134,6 +147,8 @@ struct _ClutterMainContext
|
||||
gulong redraw_count;
|
||||
|
||||
GList *repaint_funcs;
|
||||
|
||||
gint internal_child;
|
||||
};
|
||||
|
||||
#define CLUTTER_CONTEXT() (_clutter_context_get_default ())
|
||||
|
Reference in New Issue
Block a user