start adding back slider labels - CURA-4412

2025-11-02 20:52:20 -07:00 · 2017-10-09 11:26:26 +02:00 · 2017-10-09 11:26:26 +02:00 · 48e938675f
commit 48e938675f
parent d435541908
3 changed files with 159 additions and 119 deletions
--- a/plugins/LayerView/LayerSliderLabel.qml
+++ b/plugins/LayerView/LayerSliderLabel.qml
@ -0,0 +1,110 @@
+// Copyright (c) 2017 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
+
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Layouts 1.1
+import QtQuick.Controls.Styles 1.1
+
+import UM 1.0 as UM
+import Cura 1.0 as Cura
+
+Item {
+    id: sliderLabelRoot
+
+    // custom properties
+    property var target // Qt.point
+    property real maximumValue: 100
+    property real value: 0
+    property var setValue // Function
+    property bool busy: false
+
+    x: parent.x
+    y: parent.y
+    height: parent.height
+    visible: true
+
+    UM.PointingRectangle {
+        x: sliderLabelRoot.x
+        y: sliderLabelRoot.y
+        target: sliderLabelRoot.target
+        arrowSize: UM.Theme.getSize("default_arrow").width
+        height: sliderLabelRoot.height
+        width: valueLabel.width + UM.Theme.getSize("default_margin").width
+
+        color: UM.Theme.getColor("tool_panel_background")
+        borderColor: UM.Theme.getColor("lining")
+        borderWidth: UM.Theme.getSize("default_lining").width
+
+        visible: sliderLabelRoot.visible
+
+        Behavior on height {
+            NumberAnimation {
+                duration: 50
+            }
+        }
+
+        // catch all mouse events so they're not handled by underlying 3D scene
+        MouseArea {
+            anchors.fill: parent
+        }
+
+        TextField {
+            id: valueLabel
+
+            anchors {
+                left: parent.left
+                leftMargin: UM.Theme.getSize("default_margin").width / 2
+                verticalCenter: parent.verticalCenter
+            }
+
+            width: Math.max(UM.Theme.getSize("line").width * sliderLabelRoot.maximumValue.length + 2 * screenScaleFactor, 20 * screenScaleFactor)
+
+            text: sliderLabelRoot.value + 1 // the current handle value, add 1 because layers is an array
+            horizontalAlignment: TextInput.AlignRight
+
+            style: TextFieldStyle {
+                textColor: UM.Theme.getColor("setting_control_text")
+                font: UM.Theme.getFont("default")
+                background: Item { }
+            }
+
+            onEditingFinished: {
+
+                // Ensure that the cursor is at the first position. On some systems the text isn't fully visible
+                // Seems to have to do something with different dpi densities that QML doesn't quite handle.
+                // Another option would be to increase the size even further, but that gives pretty ugly results.
+                cursorPosition = 0
+
+                if (valueLabel.text != "") {
+                    // -1 because we need to convert back to an array structure
+                    sliderLabelRoot.setValue(parseInt(valueLabel.text) - 1)
+                }
+            }
+
+            validator: IntValidator {
+                bottom: 1
+                top: sliderLabelRoot.maximumValue + 1 // +1 because actual layers is an array
+            }
+
+            Keys.onUpPressed: sliderLabelRoot.setValue(sliderLabelRoot.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
+            Keys.onDownPressed: sliderLabelRoot.setValue(sliderLabelRoot.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
+        }
+
+        BusyIndicator {
+            id: busyIndicator
+
+            anchors {
+                left: parent.right
+                leftMargin: UM.Theme.getSize("default_margin").width / 2
+                verticalCenter: parent.verticalCenter
+            }
+
+            width: sliderLabelRoot.height
+            height: width
+
+            visible: sliderLabelRoot.busy
+            running: sliderLabelRoot.busy
+        }
+    }
+}