From 42bfcc3d93db3daf6bbed8fff002a791e88211a5 Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 10 Feb 2020 11:32:19 +0000 Subject: [PATCH] CtrlCore: MacOS multimonitor with mixed UHD fix git-svn-id: svn://ultimatepp.org/upp/trunk@13979 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/CocoApp.mm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/uppsrc/CtrlCore/CocoApp.mm b/uppsrc/CtrlCore/CocoApp.mm index 0641606b9..4ef63ac20 100644 --- a/uppsrc/CtrlCore/CocoApp.mm +++ b/uppsrc/CtrlCore/CocoApp.mm @@ -72,12 +72,14 @@ void CocoInit(int argc, const char **argv, const char **envptr) Font::SetFace(0, ToString((CFStringRef)[sysfont familyName]), Font::TTF); Ctrl::SetUHDEnabled(true); + bool uhd = true; for (NSScreen *screen in [NSScreen screens]) { - if([screen backingScaleFactor] > 1) { - SetUHDMode(true); + if([screen backingScaleFactor] < 2) { + uhd = false; break; } } + SetUHDMode(uhd); Font::SetDefaultFont(StdFont(fceil(DPI([sysfont pointSize]))));