mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 19:42:05 +00:00
Revert "compositor: Delay meta_compositor_add_window until the first show"
This reverts commit 4efe4483fb
.
This commit is contained in:
parent
0be4622e14
commit
9b24ae2033
@ -140,6 +140,19 @@ meta_compositor_destroy (MetaCompositor *compositor)
|
|||||||
clutter_threads_remove_repaint_func (compositor->repaint_func_id);
|
clutter_threads_remove_repaint_func (compositor->repaint_func_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
add_win (MetaWindow *window)
|
||||||
|
{
|
||||||
|
MetaScreen *screen = meta_window_get_screen (window);
|
||||||
|
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
|
||||||
|
|
||||||
|
g_return_if_fail (info != NULL);
|
||||||
|
|
||||||
|
meta_window_actor_new (window);
|
||||||
|
|
||||||
|
sync_actor_stacking (info);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
process_damage (MetaCompositor *compositor,
|
process_damage (MetaCompositor *compositor,
|
||||||
XDamageNotifyEvent *event,
|
XDamageNotifyEvent *event,
|
||||||
@ -819,20 +832,13 @@ meta_compositor_add_window (MetaCompositor *compositor,
|
|||||||
{
|
{
|
||||||
MetaScreen *screen = meta_window_get_screen (window);
|
MetaScreen *screen = meta_window_get_screen (window);
|
||||||
MetaDisplay *display = meta_screen_get_display (screen);
|
MetaDisplay *display = meta_screen_get_display (screen);
|
||||||
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
|
|
||||||
|
|
||||||
g_return_if_fail (info != NULL);
|
|
||||||
|
|
||||||
/* Window was already added previously, probably coming
|
|
||||||
* back from hiding */
|
|
||||||
if (window->compositor_private != NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
|
DEBUG_TRACE ("meta_compositor_add_window\n");
|
||||||
meta_error_trap_push (display);
|
meta_error_trap_push (display);
|
||||||
meta_window_actor_new (window);
|
|
||||||
meta_error_trap_pop (display);
|
|
||||||
|
|
||||||
sync_actor_stacking (info);
|
add_win (window);
|
||||||
|
|
||||||
|
meta_error_trap_pop (display);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -1217,6 +1217,9 @@ _meta_window_shared_new (MetaDisplay *display,
|
|||||||
set_net_wm_state (window);
|
set_net_wm_state (window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (screen->display->compositor)
|
||||||
|
meta_compositor_add_window (screen->display->compositor, window);
|
||||||
|
|
||||||
/* Sync stack changes */
|
/* Sync stack changes */
|
||||||
meta_stack_thaw (window->screen->stack);
|
meta_stack_thaw (window->screen->stack);
|
||||||
|
|
||||||
@ -2769,8 +2772,8 @@ meta_window_show (MetaWindow *window)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
meta_compositor_add_window (window->display->compositor, window);
|
meta_compositor_show_window (window->display->compositor,
|
||||||
meta_compositor_show_window (window->display->compositor, window, effect);
|
window, effect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user