AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wip/dont-postpone-subsurface-resize' into 'gtk-3-24'

Browse Source 
wayland: Don't postpone resizes for subsurfaces

See merge request GNOME/gtk!1620
This commit is contained in:
Matthias Clasen 2020-04-03 16:43:19 +00:00
commit eecd33146e
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/wayland/gdkwindow-wayland.c
View File

@ -272,6 +272,8 @@ static gboolean gdk_wayland_window_is_exported (GdkWindow *window);
static void gdk_wayland_window_unexport (GdkWindow *window);
static void gdk_wayland_window_announce_decoration_mode (GdkWindow *window);
static gboolean should_map_as_subsurface (GdkWindow *window);
GType _gdk_window_impl_wayland_get_type (void);
G_DEFINE_TYPE (GdkWindowImplWayland, _gdk_window_impl_wayland, GDK_TYPE_WINDOW_IMPL)
@ -1078,6 +1080,21 @@ is_realized_popup (GdkWindow *window)
impl->display_server.zxdg_popup_v6);
}
static gboolean
needs_initial_configure (GdkWindow *window)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
if (impl->display_server.wl_subsurface)
return FALSE;
else if (is_realized_toplevel (window))
return TRUE;
else if (is_realized_popup (window))
return TRUE;
else
return !should_map_as_subsurface (window);
}
static void
gdk_wayland_window_maybe_configure (GdkWindow *window,
int width,
@ -1093,7 +1110,8 @@ gdk_wayland_window_maybe_configure (GdkWindow *window,
impl->scale == scale)
return;
if (!impl->initial_configure_received)
if (needs_initial_configure (window) &&
!impl->initial_configure_received)
{
impl->unconfigured_width = width;
impl->unconfigured_height = height;