diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-18 15:56:51 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-04-18 15:56:51 +0200 |
commit | f5b91d87a49c4e34063e72aa06a0f3d8eb1be50a (patch) | |
tree | ea73d00b663b00dc78a52d02914755544bef6358 /src/imports/controls/material/DialogButtonBox.qml | |
parent | bfc784a53771e4cb700e07495125b20a4f3b949c (diff) | |
parent | 91e29613f9671989455345a01da9f840a98d06f9 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ia851f3ac828908ad693f393797e1e2c54bea5eef
Diffstat (limited to 'src/imports/controls/material/DialogButtonBox.qml')
-rw-r--r-- | src/imports/controls/material/DialogButtonBox.qml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml index c36a7749..c4b3e0ad 100644 --- a/src/imports/controls/material/DialogButtonBox.qml +++ b/src/imports/controls/material/DialogButtonBox.qml @@ -50,8 +50,8 @@ T.DialogButtonBox { spacing: 8 padding: 8 - topPadding: padding - 4 - bottomPadding: padding - 4 + topPadding: 2 + bottomPadding: 2 alignment: Qt.AlignRight Material.foreground: Material.accent @@ -73,6 +73,7 @@ T.DialogButtonBox { implicitHeight: 52 radius: 2 color: control.Material.dialogColor + // Rounded corners should be only at the top or at the bottom topPadding: control.position === T.DialogButtonBox.Footer ? -2 : 0 bottomPadding: control.position === T.DialogButtonBox.Header ? -2 : 0 clip: true |