3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move upper layer slider handle label to the top

Browse source 
CURA-6854
This commit is contained in:
Nino van Hooff 2019-10-29 11:47:39 +01:00
parent 2beeca0687
commit 5ebdae9f1a
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/SimulationView/LayerSlider.qml
View file

@ -275,10 +275,12 @@ Item
{ {
id: upperHandleLabel id: upperHandleLabel
height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height height: sliderRoot.handleSize + UM.Theme.getSize("small_margin").height
x: parent.x - parent.width - width //x: parent.x
anchors.verticalCenter: parent.verticalCenter anchors.bottom: parent.top
target: Qt.point(sliderRoot.width, y + height / 2) anchors.bottomMargin: UM.Theme.getSize("narrow_margin").height
anchors.horizontalCenter: parent.horizontalCenter
target: Qt.point(parent.width / 2, parent.top)
visible: sliderRoot.activeHandle == parent visible: sliderRoot.activeHandle == parent
// custom properties // custom properties

10
plugins/SimulationView/SimulationSliderLabel.qml
View file

@ -20,9 +20,9 @@ UM.PointingRectangle {
property int startFrom: 1 property int startFrom: 1
target: Qt.point(parent.width, y + height / 2) 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 height: parent.height
width: valueLabel.width + UM.Theme.getSize("default_margin").width width: valueLabel.width
visible: false visible: false
color: UM.Theme.getColor("tool_panel_background") color: UM.Theme.getColor("tool_panel_background")
@ -48,9 +48,9 @@ UM.PointingRectangle {
horizontalCenter: parent.horizontalCenter 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 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) // 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.onUpPressed: sliderLabelRoot.setValue(sliderLabelRoot.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
@ -58,7 +58,7 @@ UM.PointingRectangle {
style: TextFieldStyle { style: TextFieldStyle {
textColor: UM.Theme.getColor("setting_control_text") textColor: UM.Theme.getColor("setting_control_text")
font: UM.Theme.getFont("default") font: UM.Theme.getFont("small")
background: Item { } background: Item { }
} }