Reposition layer sliders when settings are hidden

Author: fieldOfView

resources/qml/SidebarStageMenu.qml

@@ -22,7 +22,8 @@ Item
     property bool isLE46
 
     property bool preSlicedData: PrintInformation !== null && PrintInformation.preSliced
-    property bool sidebarVisible: UM.Preferences.getValue("view/settings_visible") && !preSlicedData
+    property bool settingsVisible: UM.Preferences.getValue("view/settings_visible")
+    property bool sidebarVisible: settingsVisible && !preSlicedData
     property real sidebarWidth: sidebarVisible ? printSetupSelector.width : 0
 
     Component.onCompleted:
@@ -148,15 +149,15 @@ Item
         {
             if (preference == "view/settings_visible")
             {
-                sidebarVisible = UM.Preferences.getValue("view/settings_visible") && !preSlicedData
+                settingsVisible = UM.Preferences.getValue("view/settings_visible")
                 base.onWidthChanged(base.width)
             }
         }
     }
 
     onPreSlicedDataChanged:
     {
-        sidebarVisible = UM.Preferences.getValue("view/settings_visible") && !preSlicedData
+        settingsVisible = UM.Preferences.getValue("view/settings_visible")
         base.onWidthChanged(base.width)
     }
 

resources/qml/StageMain.qml

@@ -11,16 +11,35 @@ Loader
     id: loader
     source: UM.Controller.activeView != null && UM.Controller.activeView.mainComponent != null ? UM.Controller.activeView.mainComponent : ""
 
+    property bool preSlicedData: PrintInformation !== null && PrintInformation.preSliced
+    property bool settingsVisible: UM.Preferences.getValue("view/settings_visible")
+    property bool sidebarVisible: settingsVisible && !preSlicedData
+
     onLoaded:
     {
         var viewString = UM.Controller.activeView + "";
         var activeView = viewString.substr(0, viewString.indexOf("("));
         if(activeView == "SimulationView")
         {
+            var sidebarFooter = stageMenu.item.children[5];
+
             var pathSlider = item.children[0];
             pathSlider.anchors.horizontalCenter = undefined;
             pathSlider.anchors.right = pathSlider.parent.right;
-            pathSlider.anchors.rightMargin = UM.Theme.getSize("print_setup_widget").width + UM.Theme.getSize("default_margin").width;
+            pathSlider.anchors.rightMargin = Qt.binding(function()
+            {
+                if(sidebarVisible)
+                    return UM.Theme.getSize("print_setup_widget").width + UM.Theme.getSize("default_margin").width;
+                else
+                    return UM.Theme.getSize("default_margin").width;
+            });
+            pathSlider.anchors.bottomMargin = Qt.binding(function()
+            {
+                if(sidebarVisible)
+                    return UM.Theme.getSize("default_margin").height;
+                else
+                    return sidebarFooter.height + UM.Theme.getSize("default_margin").height
+            });
 
             var layerSlider = item.children[2];
             layerSlider.anchors.right = pathSlider.right;
@@ -31,11 +50,27 @@ Loader
             layerSlider.anchors.bottomMargin = UM.Theme.getSize("default_margin").height;
             layerSlider.height = Qt.binding(function()
             {
+                var unavailableHeight = (stageMenu.item.children[2].height + pathSlider.height + 5 * UM.Theme.getSize("default_margin").height);
+                if(!sidebarVisible)
+                    unavailableHeight = (sidebarFooter.height + stageMenu.item.children[3].height + pathSlider.height + 3 * UM.Theme.getSize("default_margin").height)
+
                 return Math.min(
                         UM.Theme.getSize("slider_layerview_size").height,
-                        contentItem.height - (stageMenu.item.children[2].height + pathSlider.height + 5 * UM.Theme.getSize("default_margin").height)
+                        contentItem.height - unavailableHeight
                     );
             })
         }
     }
+
+    Connections
+    {
+        target: UM.Preferences
+        onPreferenceChanged:
+        {
+            if (preference == "view/settings_visible")
+            {
+                settingsVisible = UM.Preferences.getValue("view/settings_visible")
+            }
+        }
+    }
 }