Check if toolpanel intersects with any screen or reset its position

Also don't restore toolpanel window position when preference not to restore window geometry is set (to solve startup crashes)

Author: fieldOfView

SidebarGUIProxy.py

@@ -5,13 +5,13 @@
 from UM.Logger import Logger
 from UM.FlameProfiler import pyqtSlot
 
+from PyQt5.QtCore import QObject, QRectF
+
 try:
     from cura.Machines.ContainerTree import ContainerTree
 except ImportError:
     ContainerTree = None  # type: ignore
 
-from PyQt5.QtCore import QObject
-
 class SidebarGUIProxy(QObject):
     def __init__(self, parent = None) -> None:
         super().__init__(parent)
@@ -66,3 +66,17 @@ def getExtruderHasQualityForMaterial(self, extruder_stack):
             containers_metadata = container_registry.findInstanceContainersMetadata(**search_criteria)
 
             return containers_metadata != []
+
+
+    @pyqtSlot("QVariant", result = bool)
+    def checkRectangleOnScreen(self, rectangle):
+        # Check if rectangle is not outside the currently available screens
+        application = Application.getInstance()
+        screen_found = False
+        for screen_number in range(0, application.desktop().screenCount()):
+            if rectangle.intersects(QRectF(application.desktop().availableGeometry(screen_number))):
+                screen_found = True
+                break
+        if not screen_found:
+            return False
+        return True

resources/qml/SidebarStageMenu.qml

@@ -312,16 +312,41 @@ Item
 
         flags: Qt.Tool | Qt.WindowTitleHint;
 
+        function boolCheck(value) //Hack to ensure a good match between python and qml.
+        {
+            if(value == "True")
+            {
+                return true
+            }else if(value == "False" || value == undefined)
+            {
+                return false
+            }
+            else
+            {
+                return value
+            }
+        }
+
         minimumWidth: UM.Theme.getSize("print_setup_widget").width
         maximumWidth: minimumWidth
         width: minimumWidth
 
         minimumHeight: Math.floor(1.5 * minimumWidth)
-        height: UM.Preferences.getValue("sidebargui/settings_window_height") != 0 ? UM.Preferences.getValue("sidebargui/settings_window_left") : minimumHeight
+        height: UM.Preferences.getValue("sidebargui/settings_window_height") != 0 ? UM.Preferences.getValue("sidebargui/settings_window_height") : minimumHeight
         onHeightChanged: UM.Preferences.setValue("sidebargui/settings_window_height", height)
 
-        x: UM.Preferences.getValue("sidebargui/settings_window_left") != 65535 ? UM.Preferences.getValue("sidebargui/settings_window_left") : undefined
-        y: UM.Preferences.getValue("sidebargui/settings_window_top") != 65535 ? UM.Preferences.getValue("sidebargui/settings_window_top") : undefined
+        x:
+        {
+            if (UM.Preferences.getValue("sidebargui/settings_window_left") != 65535 && boolCheck(UM.Preferences.getValue("general/restore_window_geometry")))
+                return UM.Preferences.getValue("sidebargui/settings_window_left")
+            return base.x + base.width - sidebarToolWindow.width + UM.Theme.getSize("wide_margin").width
+        }
+        y:
+        {
+            if (UM.Preferences.getValue("sidebargui/settings_window_top") != 65535 && boolCheck(UM.Preferences.getValue("general/restore_window_geometry")))
+                return UM.Preferences.getValue("sidebargui/settings_window_top")
+            return base.y + UM.Theme.getSize("wide_margin").width
+        }
         onXChanged: UM.Preferences.setValue("sidebargui/settings_window_left", x)
         onYChanged: UM.Preferences.setValue("sidebargui/settings_window_top", y)
 
@@ -342,6 +367,11 @@ Item
         {
             if (visible)
             {
+                if(!Cura.SidebarGUIPlugin.checkRectangleOnScreen(Qt.rect(sidebarToolWindow.x, sidebarToolWindow.y, sidebarToolWindow.width, sidebarToolWindow.height)))
+                {
+                    sidebarToolWindow.x = base.x + base.width - sidebarToolWindow.width + UM.Theme.getSize("wide_margin").width
+                    sidebarToolWindow.y = base.y + UM.Theme.getSize("wide_margin").width
+                }
                 printSetupWindow.children = [sidebarContents]
                 printSetupTooltip.visible = false  // hide vestigial tooltip in main window
             }