diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
| commit | 284057d12fea9339744ddc646aa53cfe6c3c95a1 (patch) | |
| tree | 61bb12637c56a282830d683e346057b00d332b7a /src/imports/controls/material/DialogButtonBox.qml | |
| parent | 91b2721fdc2aba28d3c45111779fed70f7c4f87d (diff) | |
| parent | c8e9b5f25fb12c3b7983658d738165181b4d6672 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RoundButton.qml
src/imports/controls/universal/RadioDelegate.qml
Change-Id: I4cb14c19bd5f6e19b70b03fb394c76712e6dda08
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 7f4c3606..f66ecda3 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 |