isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 15:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid restacking animating hidden actors

Browse Source 
Since the stack passed to the compositor now accurately reflects
the X stacking order, we need to treat hidden windows (which are
at the bottom of the X stacking order) specially - when the
compositor stacking order is synced, try to keep animating hidden
actors in their old positions in the stack.

http://bugzilla.gnome.org/show_bug.cgi?id=585984
This commit is contained in:
Owen W. Taylor 2009-06-26 17:05:11 -04:00
parent 2bf0b2b6de
commit 8a0de6dfd3
1 changed files with 64 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/compositor/mutter/compositor-mutter.c
View File

@ -2430,26 +2430,77 @@ clutter_cmp_sync_stack (MetaCompositor *compositor,
MetaScreen *screen, MetaScreen *screen,
GList *stack) GList *stack)
{ {
GList *tmp; GList *old_stack;
MetaCompScreen *info = meta_screen_get_compositor_data (screen); MetaCompScreen *info = meta_screen_get_compositor_data (screen);
DEBUG_TRACE ("clutter_cmp_sync_stack\n"); DEBUG_TRACE ("clutter_cmp_sync_stack\n");
/* NB: The first entry in stack, is stacked the highest */
for (tmp = stack; tmp != NULL; tmp = tmp->next) /* This is painful because hidden windows that we are in the process
* of animating out of existence. They'll be at the bottom of the
* stack of X windows, but we want to leave them in their old position
* until the animation effect finishes.
*/
/* Sources: first window is the highest */
stack = g_list_copy (stack); /* The new stack of MetaWindow */
old_stack = g_list_reverse (info->windows); /* The old stack of MutterWindow */
info->windows = NULL;
while (TRUE)
{ {
MetaWindow *window = tmp->data; MutterWindow *old_actor = NULL, *stack_actor = NULL, *actor;
MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window)); MetaWindow *old_window = NULL, *stack_window = NULL, *window;
if (!cw) /* Find the remaining top actor in our existing stack */
{ if (old_stack)
meta_verbose ("Failed to find corresponding MutterWindow " {
"for window %p\n", window); old_actor = old_stack->data;
continue; old_window = mutter_window_get_meta_window (old_actor);
} }
info->windows = g_list_remove (info->windows, (gconstpointer)cw); /* And the remaining top actor in the new stack */
info->windows = g_list_prepend (info->windows, cw); while (stack)
{
stack_window = stack->data;
stack_actor = MUTTER_WINDOW (meta_window_get_compositor_private (stack_window));
if (!stack_actor)
{
meta_verbose ("Failed to find corresponding MutterWindow "
"for window %s\n", meta_window_get_description (stack_window));
stack = g_list_delete_link (stack, stack);
}
else
break;
}
if (!old_actor && !stack_actor) /* Nothing more to stack */
break;
/* We usually prefer the window in the new stack, but if if we
* found a hidden window in the process of being animated out
* of existence in the old stack we use that instead.
*/
if (old_actor &&
(!stack_actor ||
(old_window->hidden &&
effect_in_progress (old_actor, TRUE))))
{
actor = old_actor;
window = old_window;
}
else
{
actor = stack_actor;
window = stack_window;
}
/* OK, we know what actor we want next. Add it to our window
* list, and remove it from the sources.
*/
info->windows = g_list_prepend (info->windows, actor);
stack = g_list_remove (stack, window);
old_stack = g_list_remove (old_stack, actor);
} }
sync_actor_stacking (info->windows); sync_actor_stacking (info->windows);