Move LayerView slider down

CURA-4212
This commit is contained in:
Lipu Fei 2017-09-07 16:56:13 +02:00
parent c59bd6cc09
commit c8a92f2c59
2 changed files with 6 additions and 25 deletions

View file

@ -64,26 +64,7 @@ Item
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("layerview_row_spacing").height spacing: UM.Theme.getSize("layerview_row_spacing").height
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width * 2 anchors.rightMargin: UM.Theme.getSize("default_margin").width
Label
{
id: layersLabel
anchors.left: parent.left
text: catalog.i18nc("@label","View Mode: Layers")
font: UM.Theme.getFont("default_bold");
color: UM.Theme.getColor("text")
Layout.fillWidth: true
elide: Text.ElideMiddle;
}
Label
{
id: spaceLabel
anchors.left: parent.left
text: " "
font.pointSize: 0.5
}
Label Label
{ {
@ -355,7 +336,7 @@ Item
id: slider id: slider
width: handleSize width: handleSize
height: parent.height - 2*UM.Theme.getSize("slider_layerview_margin").height height: parent.height - 2*UM.Theme.getSize("slider_layerview_margin").height
anchors.top: parent.top anchors.top: parent.bottom
anchors.topMargin: UM.Theme.getSize("slider_layerview_margin").height anchors.topMargin: UM.Theme.getSize("slider_layerview_margin").height
anchors.right: layerViewMenu.right anchors.right: layerViewMenu.right
anchors.rightMargin: UM.Theme.getSize("slider_layerview_margin").width anchors.rightMargin: UM.Theme.getSize("slider_layerview_margin").width
@ -569,10 +550,10 @@ Item
UM.PointingRectangle UM.PointingRectangle
{ {
x: parent.width + UM.Theme.getSize("slider_layerview_background").width / 2; x: parent.width - UM.Theme.getSize("slider_layerview_background").width / 2 - width;
y: Math.floor(slider.activeHandle.y + slider.activeHandle.height / 2 - height / 2); y: Math.floor(slider.activeHandle.y + slider.activeHandle.height / 2 - height / 2);
target: Qt.point(0, slider.activeHandle.y + slider.activeHandle.height / 2) target: Qt.point(parent.width, slider.activeHandle.y + slider.activeHandle.height / 2)
arrowSize: UM.Theme.getSize("default_arrow").width arrowSize: UM.Theme.getSize("default_arrow").width
height: UM.Theme.getSize("slider_handle").height + UM.Theme.getSize("default_margin").height height: UM.Theme.getSize("slider_handle").height + UM.Theme.getSize("default_margin").height

View file

@ -332,8 +332,8 @@
"slider_layerview_background": [4.0, 0.0], "slider_layerview_background": [4.0, 0.0],
"slider_layerview_margin": [1.0, 1.0], "slider_layerview_margin": [1.0, 1.0],
"layerview_menu_size": [16.5, 22.0], "layerview_menu_size": [15, 19.5],
"layerview_menu_size_compatibility": [22, 23.0], "layerview_menu_size_compatibility": [22, 22.0],
"layerview_legend_size": [1.0, 1.0], "layerview_legend_size": [1.0, 1.0],
"layerview_row": [11.0, 1.5], "layerview_row": [11.0, 1.5],
"layerview_row_spacing": [0.0, 0.5], "layerview_row_spacing": [0.0, 0.5],