AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-03 17:21:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'gtk-surface-release-4' into 'master'

Browse Source 
wayland: Signal gtk-shell surface destruction to the server

See merge request GNOME/gtk!3129
This commit is contained in:
Jonas Ådahl 2021-01-29 16:21:05 +00:00
commit ad3a35b4c5
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/wayland/gdkdisplay-wayland.c
View File

@ -94,7 +94,7 @@
#define MIN_SYSTEM_BELL_DELAY_MS 20 #define MIN_SYSTEM_BELL_DELAY_MS 20
#define GTK_SHELL1_VERSION 3 #define GTK_SHELL1_VERSION 4
#define OUTPUT_VERSION_WITH_DONE 2 #define OUTPUT_VERSION_WITH_DONE 2
#define NO_XDG_OUTPUT_DONE_SINCE_VERSION 3 #define NO_XDG_OUTPUT_DONE_SINCE_VERSION 3

6
gdk/wayland/gdksurface-wayland.c
View File

@ -2967,7 +2967,11 @@ gdk_wayland_surface_hide_surface (GdkSurface *surface)
if (impl->display_server.gtk_surface) if (impl->display_server.gtk_surface)
{ {
gtk_surface1_destroy (impl->display_server.gtk_surface); if (display_wayland->gtk_shell_version >=
GTK_SURFACE1_RELEASE_SINCE_VERSION)
gtk_surface1_release (impl->display_server.gtk_surface);
else
gtk_surface1_destroy (impl->display_server.gtk_surface);
impl->display_server.gtk_surface = NULL; impl->display_server.gtk_surface = NULL;
impl->application.was_set = FALSE; impl->application.was_set = FALSE;
} }

7
gdk/wayland/protocol/gtk-shell.xml
View File

@ -1,6 +1,6 @@
<protocol name="gtk"> <protocol name="gtk">
<interface name="gtk_shell1" version="3"> <interface name="gtk_shell1" version="4">
<description summary="gtk specific extensions"> <description summary="gtk specific extensions">
gtk_shell is a protocol extension providing additional features for gtk_shell is a protocol extension providing additional features for
clients implementing it. clients implementing it.
@ -35,7 +35,7 @@
</request> </request>
</interface> </interface>
<interface name="gtk_surface1" version="3"> <interface name="gtk_surface1" version="4">
<request name="set_dbus_properties"> <request name="set_dbus_properties">
<arg name="application_id" type="string" allow-null="true"/> <arg name="application_id" type="string" allow-null="true"/>
<arg name="app_menu_path" type="string" allow-null="true"/> <arg name="app_menu_path" type="string" allow-null="true"/>
@ -82,6 +82,9 @@
<request name="request_focus" since="3"> <request name="request_focus" since="3">
<arg name="startup_id" type="string" allow-null="true"/> <arg name="startup_id" type="string" allow-null="true"/>
</request> </request>
<!-- Version 4 additions -->
<request name="release" type="destructor" since="4"/>
</interface> </interface>
</protocol> </protocol>