From 68bd5a6e3767616edfe3f2732257dfe00edb2dd9 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 30 May 2017 09:16:24 +0200 Subject: [PATCH] Use Item and anchors to set material row layout CURA-3810 --- resources/qml/SidebarHeader.qml | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index 94e04c3317..8e9c9bc6ba 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -159,7 +159,7 @@ Column visible: !extruderSelectionRow.visible } - Row + Item { id: variantRow @@ -196,23 +196,22 @@ Column } anchors.verticalCenter: parent.verticalCenter + anchors.left: variantRow.left width: parent.width * 0.30 font: UM.Theme.getFont("default"); color: UM.Theme.getColor("text"); } - Text - { - width: parent.width * 0.05 - } - Button { id: materialInfoButton height: parent.height * 0.70 width: height - anchors.margins: UM.Theme.getSize("default_margin").width + + anchors.left: variantLabel.right + anchors.leftMargin: UM.Theme.getSize("default_margin").width * 2 anchors.verticalCenter: parent.verticalCenter + visible: extrudersList.visible text: "i" @@ -244,21 +243,10 @@ Column } } - Text // to take the space of the material info button when the active machine doesn't have multiple extruders - { - height: parent.height * 0.70 - width: height - visible: !extrudersList.visible - } - - Text - { - width: parent.width * 0.10 - materialInfoButton.width - UM.Theme.getSize("default_margin").width - } - Item { anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right width: parent.width * 0.50 + UM.Theme.getSize("default_margin").width height: UM.Theme.getSize("setting_control").height