Merge branch 'CURA-6854_align_layer_label_top_bottom' of github.com:Ultimaker/Cura

plugins/SimulationView/LayerSlider.qml

@@ -155,25 +155,13 @@ Item
             }
 
             onPositionChanged: parent.onHandleDragged()
-            onPressed: sliderRoot.setActiveHandle(rangeHandle)
+            onPressed:
+            {
+                sliderRoot.setActiveHandle(rangeHandle)
+                sliderRoot.forceActiveFocus()
+            }
         }
 
-        SimulationSliderLabel
-        {
-            id: rangleHandleLabel
-
-            height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height
-            x: parent.x - width - UM.Theme.getSize("default_margin").width
-            anchors.verticalCenter: parent.verticalCenter
-            target: Qt.point(sliderRoot.width, y + height / 2)
-            visible: sliderRoot.activeHandle == parent
-
-            // custom properties
-            maximumValue: sliderRoot.maximumValue
-            value: sliderRoot.upperValue
-            busy: UM.SimulationView.busy
-            setValue: rangeHandle.setValueManually // connect callback functions
-        }
     }
 
     onHeightChanged : {
@@ -275,11 +263,12 @@ Item
         {
             id: upperHandleLabel
 
-            height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height
-            x: parent.x - parent.width - width
-            anchors.verticalCenter: parent.verticalCenter
-            target: Qt.point(sliderRoot.width, y + height / 2)
-            visible: sliderRoot.activeHandle == parent
+            height: sliderRoot.handleSize + UM.Theme.getSize("small_margin").height
+            anchors.bottom: parent.top
+            anchors.bottomMargin: UM.Theme.getSize("narrow_margin").height
+            anchors.horizontalCenter: parent.horizontalCenter
+            target: Qt.point(parent.width / 2, parent.top)
+            visible: sliderRoot.activeHandle == parent || sliderRoot.activeHandle == rangeHandle
 
             // custom properties
             maximumValue: sliderRoot.maximumValue
@@ -384,11 +373,12 @@ Item
         {
             id: lowerHandleLabel
 
-            height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height
-            x: parent.x - parent.width - width
-            anchors.verticalCenter: parent.verticalCenter
-            target: Qt.point(sliderRoot.width + width, y + height / 2)
-            visible: sliderRoot.activeHandle == parent
+            height: sliderRoot.handleSize + UM.Theme.getSize("small_margin").height
+            anchors.top: parent.bottom
+            anchors.topMargin: UM.Theme.getSize("narrow_margin").height
+            anchors.horizontalCenter: parent.horizontalCenter
+            target: Qt.point(parent.width / 2, parent.bottom)
+            visible: sliderRoot.activeHandle == parent || sliderRoot.activeHandle == rangeHandle
 
             // custom properties
             maximumValue: sliderRoot.maximumValue
@@ -397,4 +387,4 @@ Item
             setValue: lowerHandle.setValueManually // connect callback functions
         }
     }
-}
+}

plugins/SimulationView/SimulationSliderLabel.qml

@@ -20,9 +20,9 @@ UM.PointingRectangle {
     property int startFrom: 1
 
     target: Qt.point(parent.width, y + height / 2)
-    arrowSize: UM.Theme.getSize("default_arrow").width
+    arrowSize: UM.Theme.getSize("button_tooltip_arrow").height
     height: parent.height
-    width: valueLabel.width + UM.Theme.getSize("default_margin").width
+    width: valueLabel.width
     visible: false
 
     color: UM.Theme.getColor("tool_panel_background")
@@ -48,9 +48,9 @@ UM.PointingRectangle {
             horizontalCenter: parent.horizontalCenter
         }
 
-        width: ((maximumValue + 1).toString().length + 1) * 10 * screenScaleFactor
+        width: ((maximumValue + 1).toString().length + 1) * 8 * screenScaleFactor
         text: sliderLabelRoot.value + startFrom // the current handle value, add 1 because layers is an array
-        horizontalAlignment: TextInput.AlignRight
+        horizontalAlignment: TextInput.AlignHCenter
 
         // key bindings, work when label is currenctly focused (active handle in LayerSlider)
         Keys.onUpPressed: sliderLabelRoot.setValue(sliderLabelRoot.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
@@ -58,7 +58,7 @@ UM.PointingRectangle {
 
         style: TextFieldStyle {
             textColor: UM.Theme.getColor("setting_control_text")
-            font: UM.Theme.getFont("default")
+            font: UM.Theme.getFont("small")
             background: Item { }
         }
 

plugins/SimulationView/SimulationViewMainComponent.qml

@@ -29,14 +29,14 @@ Item
     PathSlider
     {
         id: pathSlider
-        
+
         readonly property real preferredWidth: UM.Theme.getSize("slider_layerview_size").height // not a typo, should be as long as layerview slider
         readonly property real margin: UM.Theme.getSize("default_margin").width
         readonly property real pathSliderSafeWidth: pathSliderSafeXMax - pathSliderSafeXMin
 
         height: UM.Theme.getSize("slider_handle").width
         width: preferredWidth + margin * 2 < pathSliderSafeWidth ? preferredWidth : pathSliderSafeWidth - margin * 2
- 
+
 
         anchors.bottom: parent.bottom
         anchors.bottomMargin: margin
@@ -194,9 +194,8 @@ Item
     LayerSlider
     {
         property var preferredHeight: UM.Theme.getSize("slider_layerview_size").height
-        property double heightMargin: UM.Theme.getSize("default_margin").height
+        property double heightMargin: UM.Theme.getSize("default_margin").height * 3 // extra margin to accomodate layer number tooltips
         property double layerSliderSafeHeight: layerSliderSafeYMax - layerSliderSafeYMin
-        //todo incorporate margins in safeHeight?
 
         id: layerSlider