From 55baa8b6959e1bdd17ae35bab06d57b2ed940e73 Mon Sep 17 00:00:00 2001
From: xiphon <xiphon@protonmail.com>
Date: Wed, 13 Jan 2021 03:14:57 +0000
Subject: [PATCH] main: restrict max window width/height, fix initial window
 alignment

---
 main.qml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/main.qml b/main.qml
index 82373963..f0b92076 100644
--- a/main.qml
+++ b/main.qml
@@ -1123,11 +1123,14 @@ ApplicationWindow {
 
     objectName: "appWindow"
     visible: true
-    width: screenWidth > 980 ? 980 : 800
-    height: screenHeight > maxWindowHeight ? maxWindowHeight : 700
+    width: Screen.desktopAvailableWidth > 980
+        ? 980
+        : Math.min(Screen.desktopAvailableWidth, 800)
+    height: Screen.desktopAvailableHeight > maxWindowHeight
+        ? maxWindowHeight
+        : Math.min(Screen.desktopAvailableHeight, 700)
     color: MoneroComponents.Style.appWindowBackgroundColor
     flags: persistentSettings.customDecorations ? Windows.flagsCustomDecorations : Windows.flags
-    onWidthChanged: x -= 0
 
     Timer {
         id: fiatPriceTimer
@@ -1284,8 +1287,8 @@ ApplicationWindow {
     }
 
     Component.onCompleted: {
-        x = (Screen.width - width) / 2
-        y = (Screen.height - maxWindowHeight) / 2
+        x = (Screen.desktopAvailableWidth - width) / 2;
+        y = (Screen.desktopAvailableHeight - height) / 2;
 
         translationManager.setLanguage(persistentSettings.locale.split("_")[0]);