3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Make icon height equal to text height

Browse source 
This seems to be about the same actually as what it was. But now the relation is in there.
I also made the right icon inherit as much as possible from the left icon so that if we change something, we only have to change it in the left icon.

Contributes to issue CURA-5876.
This commit is contained in:
Ghostkeeper 2018-11-20 14:50:12 +01:00
parent d42ddad606
commit 6de24250ed
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/ActionButton.qml
View file

@ -41,7 +41,7 @@ Button
{ {
id: buttonIconLeft id: buttonIconLeft
source: "" source: ""
height: Math.round(0.6 * parent.height) height: buttonText.height
width: visible ? height : 0 width: visible ? height : 0
sourceSize.width: width sourceSize.width: width
sourceSize.height: height sourceSize.height: height
@ -69,13 +69,13 @@ Button
{ {
id: buttonIconRight id: buttonIconRight
source: buttonIconLeft.source source: buttonIconLeft.source
height: Math.round(0.6 * parent.height) height: buttonText.height
width: visible ? height : 0 width: visible ? height : 0
sourceSize.width: width sourceSize.width: width
sourceSize.height: height sourceSize.height: height
color: button.hovered ? button.textHoverColor : button.textColor color: buttonIconLeft.color
visible: source != "" && button.iconOnRightSide visible: source != "" && button.iconOnRightSide
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: buttonIconLeft.verticalCenter
} }
} }