Rename tbOrientation into taskbarOrientation
authorKevin Ottens <kevin.ottens@nextcloud.com>
Wed, 20 May 2020 16:07:01 +0000 (18:07 +0200)
committerKevin Ottens (Rebase PR Action) <er-vin@users.noreply.github.com>
Mon, 15 Jun 2020 12:32:25 +0000 (12:32 +0000)
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
src/gui/tray/Window.qml

index 55e20f205a6d93a57ab896b3b1c36ad1e111469c..f0c82986efb8f9eca8d16ae0fc9a055f67a05e44 100644 (file)
@@ -24,7 +24,7 @@ Window {
         trayWindow.requestActivate();\r
         var trayWindowX;\r
         var trayWindowY;\r
-        var tbOrientation = systrayBackend.taskbarOrientation();\r
+        var taskbarOrientation = systrayBackend.taskbarOrientation();\r
         var taskbarRect = systrayBackend.taskbarRect();\r
         var screenRect = Qt.rect(0, 0, Screen.width, Screen.height)\r
         if (Qt.platform.os === "linux") {\r
@@ -32,7 +32,7 @@ Window {
             screenRect.y = Screen.virtualY\r
         }\r
 \r
-        switch(tbOrientation) {\r
+        switch(taskbarOrientation) {\r
             // Platform separation here: Windows and macOS draw coordinates have to be given in screen-coordinates\r
             // KDE and most xorg based DEs expect them as virtual coordinates\r
             case Systray.Bottom:\r
@@ -71,7 +71,7 @@ Window {
             trayWindowX = screenRect.right - trayWindow.width - 4;\r
 \r
             if (Qt.platform.os === "linux") {\r
-                trayWindowX -= tbOrientation === Systray.Right ? taskbarRect.width : 0;\r
+                trayWindowX -= taskbarOrientation === Systray.Right ? taskbarRect.width : 0;\r
             }\r
         }\r
         if (trayWindowX <= screenRect.left) {\r
@@ -79,7 +79,7 @@ Window {
             trayWindowX = screenRect.left + 4;\r
 \r
             if (Qt.platform.os === "linux") {\r
-               trayWindowX += tbOrientation === Systray.Left ? taskbarRect.width : 0;\r
+               trayWindowX += taskbarOrientation === Systray.Left ? taskbarRect.width : 0;\r
             }\r
         }\r
         if (trayWindowY <= screenRect.top) {\r
@@ -87,7 +87,7 @@ Window {
             trayWindowY = screenRect.top + 4;\r
 \r
             if (Qt.platform.os === "linux") {\r
-                trayWindowY += tbOrientation === Systray.Top ? taskbarRect.height : 0;\r
+                trayWindowY += taskbarOrientation === Systray.Top ? taskbarRect.height : 0;\r
             }\r
         }\r
         if (screenRect.bottom <= trayWindowY + trayWindow.height) {\r