mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-04-22 05:39:37 +08:00
ce7d2c36d0
10, 100, 1000 and so on. The calculation was using the maximumValue that is 9 in case we have 10 layers, since we start counting from 0 but showing from 1. Now it uses maximumValue + 1.
101 lines
3.2 KiB
QML
101 lines
3.2 KiB
QML
// 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
|
|
|
|
UM.PointingRectangle {
|
|
id: sliderLabelRoot
|
|
|
|
// custom properties
|
|
property real maximumValue: 100
|
|
property real value: 0
|
|
property var setValue // Function
|
|
property bool busy: false
|
|
property int startFrom: 1
|
|
|
|
target: Qt.point(parent.width, y + height / 2)
|
|
arrowSize: UM.Theme.getSize("default_arrow").width
|
|
height: parent.height
|
|
width: valueLabel.width + UM.Theme.getSize("default_margin").width
|
|
visible: false
|
|
|
|
color: UM.Theme.getColor("tool_panel_background")
|
|
borderColor: UM.Theme.getColor("lining")
|
|
borderWidth: UM.Theme.getSize("default_lining").width
|
|
|
|
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 {
|
|
verticalCenter: parent.verticalCenter
|
|
horizontalCenter: parent.horizontalCenter
|
|
}
|
|
|
|
width: ((maximumValue + 1).toString().length + 1) * 10 * screenScaleFactor
|
|
text: sliderLabelRoot.value + startFrom // the current handle value, add 1 because layers is an array
|
|
horizontalAlignment: TextInput.AlignRight
|
|
|
|
// key bindings, work when label is currenctly focused (active handle in LayerSlider)
|
|
Keys.onUpPressed: sliderLabelRoot.setValue(sliderLabelRoot.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
|
|
Keys.onDownPressed: sliderLabelRoot.setValue(sliderLabelRoot.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
|
|
|
|
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 != "") {
|
|
// -startFrom because we need to convert back to an array structure
|
|
sliderLabelRoot.setValue(parseInt(valueLabel.text) - startFrom)
|
|
|
|
}
|
|
}
|
|
|
|
validator: IntValidator {
|
|
bottom: startFrom
|
|
top: sliderLabelRoot.maximumValue + startFrom // +startFrom because maybe we want to start in a different value rather than 0
|
|
}
|
|
}
|
|
|
|
BusyIndicator {
|
|
id: busyIndicator
|
|
|
|
anchors {
|
|
left: parent.right
|
|
leftMargin: Math.round(UM.Theme.getSize("default_margin").width / 2)
|
|
verticalCenter: parent.verticalCenter
|
|
}
|
|
|
|
width: sliderLabelRoot.height
|
|
height: width
|
|
|
|
visible: sliderLabelRoot.busy
|
|
running: sliderLabelRoot.busy
|
|
}
|
|
}
|