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

Merge branch 'wip/cursor-output-scale-changes' into 'master'

Browse Source 
wayland: Update cursor surface scale when output scale changes

See merge request GNOME/gtk!224
This commit is contained in:
Matthias Clasen 2018-06-29 15:08:17 +00:00
commit 9c3de51412
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4516,6 +4516,12 @@ pointer_surface_update_scale (GdkDevice *device)
gdk_wayland_device_update_surface_cursor (device); gdk_wayland_device_update_surface_cursor (device);
} }
void
gdk_wayland_seat_update_cursor_scale (GdkWaylandSeat *seat)
{
pointer_surface_update_scale (seat->master_pointer);
}
static void static void
pointer_surface_enter (void *data, pointer_surface_enter (void *data,
struct wl_surface *wl_surface, struct wl_surface *wl_surface,

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

@ -38,6 +38,7 @@
#include "gdkdisplay.h" #include "gdkdisplay.h"
#include "gdkdisplay-wayland.h" #include "gdkdisplay-wayland.h"
#include "gdkmonitor-wayland.h" #include "gdkmonitor-wayland.h"
#include "gdkseat-wayland.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include "gdkdeviceprivate.h" #include "gdkdeviceprivate.h"
#include "gdkkeysprivate.h" #include "gdkkeysprivate.h"
@ -1883,9 +1884,20 @@ transform_to_string (int transform)
static void static void
update_scale (GdkDisplay *display) update_scale (GdkDisplay *display)
{ {
GList *seats;
GList *l;
g_list_foreach (gdk_wayland_display_get_toplevel_surfaces (display), g_list_foreach (gdk_wayland_display_get_toplevel_surfaces (display),
(GFunc)gdk_wayland_surface_update_scale, (GFunc)gdk_wayland_surface_update_scale,
NULL); NULL);
seats = gdk_display_list_seats (display);
for (l = seats; l; l = l->next)
{
GdkSeat *seat = l->data;
gdk_wayland_seat_update_cursor_scale (GDK_WAYLAND_SEAT (seat));
}
g_list_free (seats);
} }
static void static void

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

@ -41,4 +41,6 @@ struct _GdkWaylandSeatClass
GType gdk_wayland_seat_get_type (void) G_GNUC_CONST; GType gdk_wayland_seat_get_type (void) G_GNUC_CONST;
void gdk_wayland_seat_update_cursor_scale (GdkWaylandSeat *seat);
#endif /* __GDK_WAYLAND_SEAT_H__ */ #endif /* __GDK_WAYLAND_SEAT_H__ */