3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Make some items' size dependent on parent's. Also make the ActionButton

Browse source 
more themable.

Contributes to CURA-5784.
This commit is contained in:
Diego Prado Gesto 2018-10-18 16:06:21 +02:00
parent 0a07f48375
commit fdfa81b2b8
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
resources/qml/ActionButton.qml
View file

@ -11,28 +11,28 @@ Button
{
id: button
property alias cursorShape: mouseArea.cursorShape
property var iconSource: ""
property alias iconSource: buttonIcon.source
property alias textFont: buttonText.font
property alias cornerRadius: backgroundRect.radius
property var color: UM.Theme.getColor("primary")
property var hoverColor: UM.Theme.getColor("primary_hover")
property var disabledColor: color
property var textColor: UM.Theme.getColor("button_text")
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
{
UM.RecolorImage
{
id: buttonIcon
source: button.iconSource
width: 16 * screenScaleFactor
height: 16 * screenScaleFactor
source: ""
height: Math.round(0.6 * parent.height)
width: height
sourceSize.width: width
sourceSize.height: height
color: button.hovered ? button.textHoverColor : button.textColor
visible: button.iconSource != ""
visible: source != ""
anchors.verticalCenter: parent.verticalCenter
}
@ -41,8 +41,8 @@ Button
id: buttonText
text: button.text
color: button.enabled ? (button.hovered ? button.textHoverColor : button.textColor): button.textDisabledColor
font: button.textFont
visible: button.text != ""
font: UM.Theme.getFont("action_button")
visible: text != ""
renderType: Text.NativeRendering
anchors.verticalCenter: parent.verticalCenter
}
@ -50,8 +50,9 @@ Button
background: Rectangle
{
id: backgroundRect
color: button.enabled ? (button.hovered ? button.hoverColor : button.color) : button.disabledColor
radius: cornerRadius
radius: UM.Theme.getSize("action_button_radius").width
}
MouseArea