mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 21:15:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4279 from nextcloud/bugfix/simplify-current-screen

Browse source 
Simplify currentScreen in systray.cpp
This commit is contained in:
Claudio Cambra 2022-03-02 14:44:59 +01:00 committed by GitHub
commit fe3011cefd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/systray.cpp
View file

@ -308,15 +308,11 @@ void Systray::forceWindowInit(QQuickWindow *window) const
QScreen *Systray::currentScreen() const
{
const auto screens = QGuiApplication::screens();
const auto cursorPos = QCursor::pos();
const auto screen = QGuiApplication::screenAt(QCursor::pos());
for (const auto screen : screens) {
if (screen->geometry().contains(cursorPos)) {
return screen;
}
if(screen) {
return screen;
}
// Didn't find anything matching the cursor position,
// falling back to the primary screen
return QGuiApplication::primaryScreen();