From 888c3f51a5718c80f9b3736aa86e5953e1c4ed8d Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 29 Oct 2019 14:11:09 +0100 Subject: [PATCH] Show both handle labels instead of the range label Now that the labels are horizontally centered with the handles, the range label would overlap the bottom handle. So instead, delete the range handle and show both other handles instead. CURA-6854 --- plugins/SimulationView/LayerSlider.qml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index 4ff959370c..eff27c43a7 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -158,21 +158,6 @@ Item onPressed: sliderRoot.setActiveHandle(rangeHandle) } - SimulationSliderLabel - { - id: rangleHandleLabel - y: parent.height / 2 - height: sliderRoot.handleSize + UM.Theme.getSize("small_margin").height - anchors.horizontalCenter: parent.horizontalCenter - target: Qt.point(parent.width / 2, y -100) - visible: sliderRoot.activeHandle == parent - - // custom properties - maximumValue: sliderRoot.maximumValue - value: sliderRoot.upperValue - busy: UM.SimulationView.busy - setValue: rangeHandle.setValueManually // connect callback functions - } } onHeightChanged : { @@ -279,7 +264,7 @@ Item 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 || sliderRoot.activeHandle == rangeHandle // custom properties maximumValue: sliderRoot.maximumValue @@ -389,7 +374,7 @@ Item anchors.topMargin: UM.Theme.getSize("narrow_margin").height anchors.horizontalCenter: parent.horizontalCenter target: Qt.point(parent.width / 2, parent.bottom) - visible: sliderRoot.activeHandle == parent + visible: sliderRoot.activeHandle == parent || sliderRoot.activeHandle == rangeHandle // custom properties maximumValue: sliderRoot.maximumValue