callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mir: don't always request mir surfaces

Browse Source 
Some child window behaviour is faked by painting in the parent, so we
don't bother creating the Mir surface in that case.
This commit is contained in:
William Hua
2015-02-03 16:23:14 +01:00
parent bee39d2251
commit 85c5f6058a
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/mir/gdkmirwindowimpl.c
View File

@ -199,6 +199,15 @@ create_mir_surface (GdkDisplay *display,
return surface;
}
/* TODO: Remove once we have proper transient window support. */
static gboolean
should_render_in_parent (GdkWindow *window)
{
GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
return impl->transient_for && gdk_window_get_window_type (window) != GDK_WINDOW_TOPLEVEL;
}
static void
ensure_surface_full (GdkWindow *window,
MirBufferUsage buffer_usage)
@ -207,7 +216,7 @@ ensure_surface_full (GdkWindow *window,
MirEventDelegate event_delegate = { event_cb, NULL };
GdkMirWindowReference *window_ref;
if (impl->surface)
if (impl->surface || should_render_in_parent (window))
return;
/* no destroy notify -- we must leak for now
@ -289,15 +298,6 @@ redraw_transient (GdkWindow *window)
gdk_window_invalidate_rect (GDK_MIR_WINDOW_IMPL (window->impl)->transient_for, &r, FALSE);
}
/* TODO: Remove once we have proper transient window support. */
static gboolean
should_render_in_parent (GdkWindow *window)
{
GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
return impl->transient_for && gdk_window_get_window_type (window) != GDK_WINDOW_TOPLEVEL;
}
static void
send_buffer (GdkWindow *window)
{