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

Make sure the tray icon point is in screen coordinates

Browse source 
Previously we were using QCursor::pos() in the Linux case, which is a
fair heuristic except it will always be relative to the primary screen
and not the current screen. This explains why we had to adjust with the
virtual geometry.

In the Windows and Mac case we got the position out of QSystemTrayIcon
and that one was already relative to the current screen.

So now we use QCursor::pos(currentScreen()) which ensures we give the
coordinates relatively to the current screen also in the Linux case.

Since all platforms are now having that point in the same coordinate
system we don't need to mess around with the virtual geometry to
compensate.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
This commit is contained in:
Kevin Ottens 2020-07-15 11:23:11 +02:00 committed by Kevin Ottens
parent 2c50ecd4d3
commit 6b8d2270c6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/systray.cpp
View file

@ -279,8 +279,8 @@ QRect Systray::taskbarGeometry() const
QRect Systray::currentScreenRect() const
{
const auto screen = currentScreen();
const auto rect = screen->geometry();
return rect.translated(screen->virtualGeometry().topLeft());
Q_ASSERT(screen);
return screen->geometry();
}
QPoint Systray::computeWindowReferencePoint() const
@ -378,7 +378,7 @@ QPoint Systray::calcTrayIconCenter() const
return trayIconCenter;
#else
// On Linux, fall back to mouse position (assuming tray icon is activated by mouse click)
return QCursor::pos();
return QCursor::pos(currentScreen());
#endif
}