Merge branch 'wayland-max-cursor-scale' into 'master'

wayland: Stop capping cursor scales

See merge request GNOME/gtk!1522
This commit is contained in:
Matthias Clasen 2020-03-13 15:49:02 +00:00
commit eaf9f7e225
2 changed files with 0 additions and 5 deletions

View File

@ -162,8 +162,6 @@ _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,
int *height,
int *scale)
{
desired_scale = MIN (desired_scale, GDK_WAYLAND_MAX_THEME_SCALE);
if (gdk_cursor_get_name (cursor))
{
struct wl_cursor *c;

View File

@ -50,9 +50,6 @@
G_BEGIN_DECLS
#define GDK_WAYLAND_MAX_THEME_SCALE 3
#define GDK_WAYLAND_THEME_SCALES_COUNT GDK_WAYLAND_MAX_THEME_SCALE
#define GDK_ZWP_POINTER_GESTURES_V1_VERSION 1
typedef struct _GdkWaylandSelection GdkWaylandSelection;