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

Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown

Browse source
This commit is contained in:
Diego Prado Gesto 2018-12-05 13:56:21 +01:00
commit 07d58c3aef
64 changed files with 726 additions and 1081 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/ActionButton.qml
View file

@ -11,7 +11,7 @@ Button
{
id: button
property alias iconSource: buttonIconLeft.source
property var iconOnRightSide: false
property bool isIconOnRightSide: false
property alias textFont: buttonText.font
property alias cornerRadius: backgroundRect.radius
property alias tooltip: tooltip.text
@ -32,9 +32,13 @@ Button
// we elide the text to the right so the text will be cut off with the three dots at the end.
property var fixedWidthMode: false
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
height: UM.Theme.getSize("action_button").height
contentItem: Row
{
//Icon if displayed on the left side.
//Left side icon. Only displayed if !isIconOnRightSide.
UM.RecolorImage
{
id: buttonIconLeft
@ -44,7 +48,7 @@ Button
sourceSize.width: width
sourceSize.height: height
color: button.hovered ? button.textHoverColor : button.textColor
visible: source != "" && !button.iconOnRightSide
visible: source != "" && !button.isIconOnRightSide
anchors.verticalCenter: parent.verticalCenter
}
@ -62,7 +66,7 @@ Button
elide: Text.ElideRight
}
//Icon if displayed on the right side.
//Right side icon. Only displayed if isIconOnRightSide.
UM.RecolorImage
{
id: buttonIconRight
@ -72,7 +76,7 @@ Button
sourceSize.width: width
sourceSize.height: height
color: buttonIconLeft.color
visible: source != "" && button.iconOnRightSide
visible: source != "" && button.isIconOnRightSide
anchors.verticalCenter: buttonIconLeft.verticalCenter
}
}