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

Merge branch 'wip/keep-scale-3-24' into 'gtk-3-24'

Browse Source 
wayland/window: Only update the scale if on any outputs

See merge request GNOME/gtk!4353
This commit is contained in:
Matthias Clasen 2022-01-12 19:45:50 +00:00
commit dac9baf3b1
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gdk/wayland/gdkwindow-wayland.c
View File

@ -753,12 +753,23 @@ window_update_scale (GdkWindow *window)
return;
}
scale = 1;
for (l = impl->display_server.outputs; l != NULL; l = l->next)
if (!impl->display_server.outputs)
{
guint32 output_scale =
_gdk_wayland_screen_get_output_scale (display_wayland->screen, l->data);
scale = MAX (scale, output_scale);
scale = impl->scale;
}
else
{
scale = 1;
for (l = impl->display_server.outputs; l != NULL; l = l->next)
{
struct wl_output *output = l->data;
uint32_t output_scale;
output_scale =
_gdk_wayland_screen_get_output_scale (display_wayland->screen,
output);
scale = MAX (scale, output_scale);
}
}
/* Notify app that scale changed */