Browse Source

Make icon height equal to text height

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.
Ghostkeeper 6 years ago
parent
commit
6de24250ed
1 changed files with 4 additions and 4 deletions
  1. 4 4
      resources/qml/ActionButton.qml

+ 4 - 4
resources/qml/ActionButton.qml

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