Merge Ignacio Casal Quintero's quartz-scale-factor' into gtk-3-24.

This commit is contained in:
John Ralls 2018-12-18 10:55:35 -08:00
commit 1c1a86d0fc

View File

@ -252,7 +252,12 @@ configure_monitor (GdkMonitor *monitor)
monitor->width_mm = width;
monitor->height_mm = height;
monitor->geometry = disp_geometry;
monitor->scale_factor = 1;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
if (gdk_quartz_osx_version () >= GDK_OSX_MOUNTAIN_LION)
monitor->scale_factor = CGDisplayModeGetPixelWidth (mode) / CGDisplayModeGetWidth (mode);
else
#endif
monitor->scale_factor = 1;
monitor->refresh_rate = refresh_rate;
monitor->subpixel_layout = GDK_SUBPIXEL_LAYOUT_UNKNOWN;
CGDisplayModeRelease (mode);