[gtk+/gtk-3-22] Revert "wayland: Push NULL buffer when hiding a GdkWindow"
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-22] Revert "wayland: Push NULL buffer when hiding a GdkWindow"
- Date: Thu, 19 Jan 2017 20:23:41 +0000 (UTC)
commit bbcc3ee45643ccdc25bc525b4d7f7daf6b25440a
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Jan 19 20:07:14 2017 +0100
Revert "wayland: Push NULL buffer when hiding a GdkWindow"
This reverts commit 0f2e19c01059d151d606e7006d95dc7f60c222fc.
gdk/wayland/gdkwindow-wayland.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 508930b..d629288 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -2454,7 +2454,7 @@ unmap_popups_for_window (GdkWindow *window)
}
static void
-gdk_wayland_window_clear_surface (GdkWindow *window)
+gdk_wayland_window_hide_surface (GdkWindow *window)
{
GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_window_get_display (window));
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
@@ -2549,10 +2549,7 @@ gdk_wayland_window_clear_surface (GdkWindow *window)
static void
gdk_wayland_window_hide (GdkWindow *window)
{
- GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
-
- wl_surface_attach (impl->display_server.wl_surface, NULL, 0, 0);
- wl_surface_commit (impl->display_server.wl_surface);
+ gdk_wayland_window_hide_surface (window);
_gdk_window_clear_update_area (window);
}
@@ -2566,7 +2563,7 @@ gdk_window_wayland_withdraw (GdkWindow *window)
g_assert (!GDK_WINDOW_IS_MAPPED (window));
- gdk_wayland_window_clear_surface (window);
+ gdk_wayland_window_hide_surface (window);
}
}
@@ -2874,7 +2871,7 @@ gdk_wayland_window_destroy (GdkWindow *window,
*/
g_return_if_fail (!foreign_destroy);
- gdk_wayland_window_clear_surface (window);
+ gdk_wayland_window_hide_surface (window);
drop_cairo_surfaces (window);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]