3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix 'inverting slider' when switching between Layer view and a different view. CURA-3321

Browse source
This commit is contained in:
Jack Ha 2017-03-06 14:03:42 +01:00
parent 1f61017946
commit b2e06bed37
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
plugins/LayerView/LayerView.qml
View file

@ -10,6 +10,7 @@ import UM 1.0 as UM
Item Item
{ {
id: base
width: { width: {
if (UM.LayerView.compatibilityMode) { if (UM.LayerView.compatibilityMode) {
return UM.Theme.getSize("layerview_menu_size_compatibility").width; return UM.Theme.getSize("layerview_menu_size_compatibility").width;
@ -326,18 +327,21 @@ Item
Slider Slider
{ {
id: sliderMinimumLayer id: sliderMinimumLayer
anchors {
top: parent.top
bottom: parent.bottom
right: layerViewMenu.right
margins: UM.Theme.getSize("slider_layerview_margin").height
rightMargin: UM.Theme.getSize("slider_layerview_margin").width * 0.8
}
width: UM.Theme.getSize("slider_layerview_size").width width: UM.Theme.getSize("slider_layerview_size").width
height: parent.height - 2*UM.Theme.getSize("slider_layerview_margin").height
anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("slider_layerview_margin").height
anchors.right: layerViewMenu.right
anchors.rightMargin: UM.Theme.getSize("slider_layerview_margin").width * 0.8
orientation: Qt.Vertical orientation: Qt.Vertical
minimumValue: 0; minimumValue: 0;
maximumValue: UM.LayerView.numLayers-1; maximumValue: UM.LayerView.numLayers - 1;
stepSize: 1 stepSize: 1
property real pixelsPerStep: ((height - UM.Theme.getSize("slider_handle").height) / (maximumValue - minimumValue)) * stepSize; property real pixelsPerStep: ((height - UM.Theme.getSize("slider_handle").height) / (maximumValue - minimumValue)) * stepSize
value: UM.LayerView.minimumLayer value: UM.LayerView.minimumLayer
onValueChanged: { onValueChanged: {
@ -353,12 +357,16 @@ Item
Slider Slider
{ {
id: slider id: slider
anchors {
top: parent.top
bottom: parent.bottom
right: layerViewMenu.right
margins: UM.Theme.getSize("slider_layerview_margin").height
rightMargin: UM.Theme.getSize("slider_layerview_margin").width * 0.2
}
width: UM.Theme.getSize("slider_layerview_size").width width: UM.Theme.getSize("slider_layerview_size").width
height: parent.height - 2*UM.Theme.getSize("slider_layerview_margin").height //UM.Theme.getSize("slider_layerview_size").height
anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("slider_layerview_margin").height
anchors.right: layerViewMenu.right
anchors.rightMargin: UM.Theme.getSize("slider_layerview_margin").width * 0.2
orientation: Qt.Vertical orientation: Qt.Vertical
minimumValue: 0; minimumValue: 0;
maximumValue: UM.LayerView.numLayers; maximumValue: UM.LayerView.numLayers;