summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@theqtcompany.com>2015-01-30 13:45:32 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-02-02 10:13:14 +0000
commitead40640d55ed0f96f84f54c627e870727d45d7d (patch)
tree2d66bc69d074c1b595d0eceb3b1f60d9d6dd0f15
parent077b15b634edb4209dfa2cfd1ac7da6936e4d472 (diff)
downloadqtquickcontrols-ead40640d55ed0f96f84f54c627e870727d45d7d.tar.gz
Increase Base ButtonStyle's padding when the button has a menu.
Change-Id: I95585747f87b91a3ebd3815bdf7fdb8d5d237ea7 Task-number: QTBUG-40289 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r--src/controls/Styles/Base/ButtonStyle.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml
index 9b55d26d..b9d34b46 100644
--- a/src/controls/Styles/Base/ButtonStyle.qml
+++ b/src/controls/Styles/Base/ButtonStyle.qml
@@ -83,7 +83,7 @@ Style {
padding {
top: 4
left: 4
- right: control.menu !== null ? Math.round(TextSingleton.implicitHeight * 0.5) : 4
+ right: 4 + (control.menu !== null ? Math.round(TextSingleton.implicitHeight * 0.5) : 0)
bottom: 4
}
@@ -121,7 +121,7 @@ Style {
source: "images/arrow-down.png"
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
- anchors.rightMargin: padding.right
+ anchors.rightMargin: 4
opacity: control.enabled ? 0.6 : 0.5
}
}