3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header

Browse source
This commit is contained in:
Jaime van Kessel 2018-10-11 10:30:51 +02:00
commit 4743bd8bd5
12 changed files with 267 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/components/ActionButton.qml
View file

@ -19,6 +19,7 @@ Button
property var textHoverColor: UM.Theme.getColor("button_text_hover")
property var textDisabledColor: textColor
property var textFont: UM.Theme.getFont("action_button")
property var cornerRadius: 2 * screenScaleFactor
contentItem: Row
{
@ -32,6 +33,7 @@ Button
sourceSize.height: height
color: button.hovered ? button.textHoverColor : button.textColor
visible: button.iconSource != ""
anchors.verticalCenter: parent.verticalCenter
}
Label
@ -42,12 +44,14 @@ Button
font: button.textFont
visible: button.text != ""
renderType: Text.NativeRendering
anchors.verticalCenter: parent.verticalCenter
}
}
background: Rectangle
{
color: button.enabled ? (button.hovered ? button.hoverColor : button.color) : button.disabledColor
radius: cornerRadius
}
MouseArea