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

continue layer slider labels - CURA-4412

Browse source
This commit is contained in:
ChrisTerBeke 2017-10-09 14:19:21 +02:00
parent ee0dabd837
commit 5740af04bb
2 changed files with 77 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/LayerView/LayerSlider.qml
View file

@ -186,8 +186,8 @@ Item {
height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height
// width is calculated automatically from the input field width // width is calculated automatically from the input field width
x: (sliderRoot.width / 2 - (parent.width / 2)) - width x: parent.x - width // align with slider handle
y: Math.floor(parent.y + parent.height / 2 - height / 2) y: parent.anchors.top - height // align with slider? handle
target: Qt.point(sliderRoot.width, parent.y + parent.height / 2) target: Qt.point(sliderRoot.width, parent.y + parent.height / 2)
visible: sliderRoot.layersVisible visible: sliderRoot.layersVisible

15
plugins/LayerView/LayerSliderLabel.qml
View file

@ -9,7 +9,7 @@ import QtQuick.Controls.Styles 1.1
import UM 1.0 as UM import UM 1.0 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
Item { UM.PointingRectangle {
id: sliderLabelRoot id: sliderLabelRoot
// custom properties // custom properties
@ -19,24 +19,16 @@ Item {
property var setValue // Function property var setValue // Function
property bool busy: false 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 target: sliderLabelRoot.target
arrowSize: UM.Theme.getSize("default_arrow").width arrowSize: UM.Theme.getSize("default_arrow").width
height: sliderLabelRoot.height height: parent.height
width: valueLabel.width + UM.Theme.getSize("default_margin").width width: valueLabel.width + UM.Theme.getSize("default_margin").width
color: UM.Theme.getColor("tool_panel_background") color: UM.Theme.getColor("tool_panel_background")
borderColor: UM.Theme.getColor("lining") borderColor: UM.Theme.getColor("lining")
borderWidth: UM.Theme.getSize("default_lining").width borderWidth: UM.Theme.getSize("default_lining").width
visible: sliderLabelRoot.visible visible: true
Behavior on height { Behavior on height {
NumberAnimation { NumberAnimation {
@ -107,4 +99,3 @@ Item {
running: sliderLabelRoot.busy running: sliderLabelRoot.busy
} }
} }
}