aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2016-08-10 15:08:35 +0200
committerMitch Curtis <mitch.curtis@qt.io>2016-08-10 14:06:10 +0000
commit038a0c308a03977d3694e16b31c1cf7c7e1a5611 (patch)
treea2430c97e1160cd71f142731ada73b8ed44fe6e9 /src/imports/controls/material
parentbbc0a7b5c45e061f1aeb78c29d458fb7d4446d71 (diff)
Material: fix ToolButton's inappropriately round hover effect
The Material style ToolButton's round hover effect was indecently exposing itself. It should only be visible when the text (i.e contentItem) is not very wide. Change-Id: Ie40b5cf02356a7b444187470e1c6e68252895140 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/material')
-rw-r--r--src/imports/controls/material/ToolButton.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml
index 05192920..56101435 100644
--- a/src/imports/controls/material/ToolButton.qml
+++ b/src/imports/controls/material/ToolButton.qml
@@ -65,7 +65,7 @@ T.ToolButton {
implicitWidth: 48
implicitHeight: 48
- readonly property bool square: parent.width === parent.height
+ readonly property bool square: control.contentItem.implicitWidth <= control.contentItem.implicitHeight
x: (parent.width - width) / 2
y: (parent.height - height) / 2