Merge pull request #1228 from Ultimaker/extruder_tab_layout

Added hover color for machine selection. CURA-2763
This commit is contained in:
jack 2016-12-08 11:19:51 +01:00 committed by GitHub
commit 332ef2ed19

View file

@ -98,7 +98,6 @@ Rectangle
Row Row
{ {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
@ -108,12 +107,15 @@ Rectangle
id: machineSelection id: machineSelection
text: Cura.MachineManager.activeMachineName text: Cura.MachineManager.activeMachineName
height: UM.Theme.getSize("setting_control").height width: parent.width - (showSettings.width + showMonitor.width + 2 * UM.Theme.getSize("default_margin").width)
height: UM.Theme.getSize("sidebar_header").height
tooltip: Cura.MachineManager.activeMachineName tooltip: Cura.MachineManager.activeMachineName
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
style: ButtonStyle { style: ButtonStyle {
background: Rectangle { background: Rectangle {
color: UM.Theme.getColor("sidebar_header_bar") color: control.hovered ? UM.Theme.getColor("button_hover") :
control.pressed ? UM.Theme.getColor("button_hover") : UM.Theme.getColor("sidebar_header_bar")
UM.RecolorImage { UM.RecolorImage {
id: downArrow id: downArrow
@ -133,7 +135,7 @@ Rectangle
text: control.text; text: control.text;
elide: Text.ElideRight; elide: Text.ElideRight;
anchors.left: parent.left; anchors.left: parent.left;
anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: downArrow.left; anchors.right: downArrow.left;
anchors.rightMargin: control.rightMargin; anchors.rightMargin: control.rightMargin;
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
@ -143,8 +145,6 @@ Rectangle
label: Label{} label: Label{}
} }
width: parent.width - (showSettings.width + showMonitor.width + 2 * UM.Theme.getSize("default_margin").width)
menu: PrinterMenu { } menu: PrinterMenu { }
} }