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

Revert "gdk/wayland: go through monitor to compute scale factor"

Browse Source 
This reverts commit 6d545b6d03.

Reverting as this broke multi DPI systems, where a client is expected to
render at scale = 1 if it is only visible on a scale = 1 monitor.

Fixes: https://gitlab.gnome.org/GNOME/gtk/issues/2129
This commit is contained in:
Jonas Ådahl 2019-09-03 17:13:17 +02:00
parent eaf0e54074
commit e9fdb35687
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -651,10 +651,11 @@ on_frame_clock_after_paint (GdkFrameClock *clock,
static void
window_update_scale (GdkWindow *window)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
GdkWaylandDisplay *display_wayland =
GDK_WAYLAND_DISPLAY (gdk_window_get_display (window));
guint32 scale;
int i;
GSList *l;
if (display_wayland->compositor_version < WL_SURFACE_HAS_BUFFER_SCALE)
{
@ -663,10 +664,10 @@ window_update_scale (GdkWindow *window)
}
scale = 1;
for (i = 0; i < display_wayland->monitors->len; i++)
for (l = impl->display_server.outputs; l != NULL; l = l->next)
{
GdkWaylandMonitor *monitor = display_wayland->monitors->pdata[i];
int output_scale = gdk_monitor_get_scale_factor (GDK_MONITOR (monitor));
guint32 output_scale =
_gdk_wayland_screen_get_output_scale (display_wayland->screen, l->data);
scale = MAX (scale, output_scale);
}