1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Only skip screen reconfigure if primary screen changed

Browse Source 
Change-Id: Ia5d208ace5086e8e92f95f859383773894a18768
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit dcbe25bbbb603bc335d7cf0982a80293289b0d8f)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Tor Arne Vestbø 2019-10-27 18:57:56 +01:00
parent 577b6554f0
commit 7f0aaa88ef
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/cocoa/qcocoascreen.mm
View File

@ -93,11 +93,10 @@ void QCocoaScreen::initializeScreens()
mainDisplay->updateProperties(); mainDisplay->updateProperties();
qCInfo(lcQpaScreen) << "Primary screen changed to" << mainDisplay; qCInfo(lcQpaScreen) << "Primary screen changed to" << mainDisplay;
QWindowSystemInterface::handlePrimaryScreenChanged(mainDisplay); QWindowSystemInterface::handlePrimaryScreenChanged(mainDisplay);
if (cocoaScreen == mainDisplay)
return; // Already reconfigured
} }
if (cocoaScreen == mainDisplay)
return; // Already reconfigured
cocoaScreen->updateProperties(); cocoaScreen->updateProperties();
qCInfo(lcQpaScreen) << "Reconfigured" << cocoaScreen; qCInfo(lcQpaScreen) << "Reconfigured" << cocoaScreen;
} }