AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'gdkwaylandtoplevel' into 'main'

Browse Source 
gdk/wayland/surface: Move more members to `GdkWaylandPopup` and `GdkWaylandToplevel`

See merge request GNOME/gtk!4227
This commit is contained in:
Matthias Clasen 2022-11-10 13:58:24 +00:00
commit df5a13806d
4 changed files with 530 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@
#include "gdkdisplay-wayland.h"
#include "gdkmonitor-wayland.h"
#include "gdkseat-wayland.h"
#include "gdksurface-wayland.h"
#include "gdksurfaceprivate.h"
#include "gdkdeviceprivate.h"
#include "gdkkeysprivate.h"
@ -745,8 +746,8 @@ gdk_wayland_display_system_bell (GdkDisplay *display,
if (!display_wayland->gtk_shell)
return;
if (window)
gtk_surface = gdk_wayland_surface_get_gtk_surface (window);
if (window && GDK_IS_WAYLAND_TOPLEVEL (window))
gtk_surface = gdk_wayland_toplevel_get_gtk_surface (GDK_WAYLAND_TOPLEVEL (window));
else
gtk_surface = NULL;

2
gdk/wayland/gdkprivate-wayland.h
View File

@ -177,8 +177,6 @@ cairo_surface_t * _gdk_wayland_display_create_shm_surface (GdkWaylandDisplay *di
struct wl_buffer *_gdk_wayland_shm_surface_get_wl_buffer (cairo_surface_t *surface);
gboolean _gdk_wayland_is_shm_surface (cairo_surface_t *surface);
struct gtk_surface1 * gdk_wayland_surface_get_gtk_surface (GdkSurface *surface);
void gdk_wayland_seat_set_global_cursor (GdkSeat *seat,
GdkCursor *cursor);
void gdk_wayland_seat_set_drag (GdkSeat *seat,

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

File diff suppressed because it is too large Load Diff

3
gdk/wayland/gdksurface-wayland.h
View File

@ -38,6 +38,9 @@ void gdk_wayland_toplevel_announce_ssd (GdkTopl
gboolean gdk_wayland_toplevel_inhibit_idle (GdkToplevel *toplevel);
void gdk_wayland_toplevel_uninhibit_idle (GdkToplevel *toplevel);
struct gtk_surface1 * gdk_wayland_toplevel_get_gtk_surface (GdkWaylandToplevel *wayland_toplevel);
void gdk_wayland_surface_ensure_wl_egl_window (GdkSurface *surface);
G_END_DECLS