From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Wed, 20 May 2020 15:59:40 +0000 (+0200)
Subject: Introduce a screenRect as coordinate space
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~160^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aa90237e9439650ff802b75a623a2e781313e91b;p=nextcloud-desktop.git

Introduce a screenRect as coordinate space

The top left corner of that screenRect is (0,0) or based on
(virtualX,virtualY) depending on the platform. This leads to easier
reduction in code duplication.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 3684162d7..55e20f205 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -26,6 +26,11 @@ Window {
         var trayWindowY;
         var tbOrientation = systrayBackend.taskbarOrientation();
         var taskbarRect = systrayBackend.taskbarRect();
+        var screenRect = Qt.rect(0, 0, Screen.width, Screen.height)
+        if (Qt.platform.os === "linux") {
+            screenRect.x = Screen.virtualX
+            screenRect.y = Screen.virtualY
+        }
 
         switch(tbOrientation) {
             // Platform separation here: Windows and macOS draw coordinates have to be given in screen-coordinates
@@ -33,24 +38,21 @@ Window {
             case Systray.Bottom:
                 console.debug("Taskbar is on the bottom.");
                 trayWindowX = trayIconCenter.x - trayWindow.width / 2;
-                trayWindowY = (Qt.platform.os !== "linux") ? (Screen.height - taskbarRect.height - trayWindow.height - 4)
-                                                           : (Screen.height + Screen.virtualY - taskbarRect.height - trayWindow.height - 4);
+                trayWindowY = screenRect.bottom - taskbarRect.height - trayWindow.height - 4;
                 break;
             case Systray.Left:
                 console.debug("Taskbar is on the left.");
-                trayWindowX = (Qt.platform.os !== "linux") ? (taskbarRect.width + 4)
-                                                           : (Screen.virtualX + taskbarRect.width + 4);
+                trayWindowX = screenRect.left + taskbarRect.width + 4;
                 trayWindowY = trayIconCenter.y;
                 break;
             case Systray.Top:
                 console.debug("Taskbar is on the top.");
                 trayWindowX = trayIconCenter.x - trayWindow.width / 2;
-                trayWindowY = Screen.virtualY + taskbarRect.height + 4;
+                trayWindowY = screenRect.top + taskbarRect.height + 4;
                 break;
             case Systray.Right:
                 console.debug("Taskbar is on the right.");
-                trayWindowX = (Qt.platform.os !== "linux") ? (Screen.width - taskbarRect.width - trayWindow.width - 4)
-                                                           : (Screen.width + Screen.virtualX - taskbarRect.width - trayWindow.width - 4);
+                trayWindowX = screenRect.right - taskbarRect.width - trayWindow.width - 4;
                 trayWindowY = trayIconCenter.y;
                 break;
         }
@@ -64,38 +66,33 @@ Window {
         console.debug("Taskbar height:", taskbarRect.height);
         console.debug("Taskbar width:", taskbarRect.width);
 
-        if (Screen.width <= trayWindowX + trayWindow.width) {
+        if (screenRect.right <= trayWindowX + trayWindow.width) {
             console.debug("Out-of-screen condition on the right detected. Adjusting window position.");
-            if (Qt.platform.os !== "linux") {
-                trayWindowX = Screen.width - trayWindow.width - 4;
-            } else {
-                trayWindowX = Screen.width + Screen.virtualX - trayWindow.width - 4 - (tbOrientation === Systray.Right ? taskbarRect.width : 0);
+            trayWindowX = screenRect.right - trayWindow.width - 4;
+
+            if (Qt.platform.os === "linux") {
+                trayWindowX -= tbOrientation === Systray.Right ? taskbarRect.width : 0;
             }
         }
-        if (trayWindowX <= Screen.x && Qt.platform.os !== "linux") {
+        if (trayWindowX <= screenRect.left) {
             console.debug("Out-of-screen condition on the left detected. Adjusting window position.");
-            trayWindowX = Screen.x + 4;
-        }
-        if (trayWindowX <= Screen.virtualX && Qt.platform.os === "linux") {
-           console.debug("Out-of-screen condition on the left detected. Adjusting window position.");
-           trayWindowX = Screen.virtualX + 4 + (tbOrientation === Systray.Left ? taskbarRect.width : 0)
-        }
-        if (trayWindowY <= Screen.y && Qt.platform.os !== "linux") {
-            console.debug("Out-of-screen condition on the top detected. Adjusting window position.");
-            trayWindowY = Screen.y + 4;
+            trayWindowX = screenRect.left + 4;
+
+            if (Qt.platform.os === "linux") {
+               trayWindowX += tbOrientation === Systray.Left ? taskbarRect.width : 0;
+            }
         }
-        if (trayWindowY <= Screen.virtualY && Qt.platform.os === "linux") {
+        if (trayWindowY <= screenRect.top) {
             console.debug("Out-of-screen condition on the top detected. Adjusting window position.");
-            trayWindowY = Screen.virtualY + 4 + (tbOrientation === Systray.Top ? taskbarRect.height : 0);
+            trayWindowY = screenRect.top + 4;
+
+            if (Qt.platform.os === "linux") {
+                trayWindowY += tbOrientation === Systray.Top ? taskbarRect.height : 0;
+            }
         }
-        if (Screen.height <= trayWindowY - Screen.virtualY + trayWindow.height) {
+        if (screenRect.bottom <= trayWindowY + trayWindow.height) {
             console.debug("Out-of-screen condition on the bottom detected. Adjusting window position.");
-            if (Qt.platform.os !== "linux") {
-                trayWindowY = Screen.height - trayWindow.height - 4;
-            } else {
-                trayWindowY = Screen.height + Screen.virtualY - trayWindow.height - 4;
-            }
-
+            trayWindowY = screenRect.bottom - trayWindow.height - 4;
         }
         console.debug("Tray window position: x =",trayWindowX," y =",trayWindowY);
         trayWindow.setX(trayWindowX);