diff options
| author | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2022-03-10 15:50:44 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-12 22:59:13 +0000 |
| commit | 66d162dd18109c7e01b363d5fa4f91801e55a717 (patch) | |
| tree | a5a535a51b021b919934bc80202809912878ddc7 | |
| parent | c9ffa3b40cda688353a763499ff92ed5a0933268 (diff) | |
Fusion MessageDialog: use 12 pixels for margins, rather than 20
The other dialogs will ususally use a default 12 pixels if margins for
the Fusion style.
This patch aims to make the visuals more consistent with the other
dialogs for the Fusion style.
Task-number: QTBUG-100938
Change-Id: I29f0a8dc6c189f461324d953ddb526b1736110bb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit c8e18a9e4d49d23f87fd1f2ab4531c3764ce8501)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/MessageDialog.qml | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/MessageDialog.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/MessageDialog.qml index 54c17af2f2..380766f391 100644 --- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/MessageDialog.qml +++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Fusion/MessageDialog.qml @@ -57,20 +57,15 @@ MessageDialogImpl { + (control.implicitHeaderHeight > 0 ? control.implicitHeaderHeight + control.spacing : 0) + (control.implicitFooterHeight > 0 ? control.implicitFooterHeight + control.spacing : 0)) - leftPadding: 20 - rightPadding: 20 - // Ensure that the background's border is visible. - leftInset: -1 - rightInset: -1 - topInset: -1 - bottomInset: -1 + padding: 6 + horizontalPadding: 12 MessageDialogImpl.buttonBox: buttonBox MessageDialogImpl.detailedTextButton: detailedTextButton background: Rectangle { implicitWidth: 320 - implicitHeight: 160 + implicitHeight: 120 color: control.palette.window border.color: control.palette.mid radius: 2 @@ -100,15 +95,17 @@ MessageDialogImpl { id: textLabel objectName: "textLabel" text: control.text + visible: text.length > 0 - Layout.margins: 16 + Layout.margins: 12 } Label { id: informativeTextLabel objectName: "informativeTextLabel" text: control.informativeText + visible: text.length > 0 - Layout.margins: 16 + Layout.margins: 12 } } @@ -123,19 +120,19 @@ MessageDialogImpl { objectName: "detailedTextButton" text: control.showDetailedText ? qsTr("Hide Details...") : qsTr("Show Details...") - Layout.leftMargin: 20 + Layout.leftMargin: 12 } DialogButtonBox { id: buttonBox objectName: "buttonBox" - spacing: 12 + spacing: 6 horizontalPadding: 0 - verticalPadding: 20 + verticalPadding: 12 Layout.fillWidth: true - Layout.leftMargin: detailedTextButton.visible ? 12 : 20 - Layout.rightMargin: 20 + Layout.leftMargin: detailedTextButton.visible ? 6 : 12 + Layout.rightMargin: 12 } } @@ -148,9 +145,9 @@ MessageDialogImpl { readOnly: true Layout.fillWidth: true - Layout.leftMargin: 20 - Layout.rightMargin: 20 - Layout.bottomMargin: 20 + Layout.leftMargin: 12 + Layout.rightMargin: 12 + Layout.bottomMargin: 12 background: Rectangle { color: Qt.rgba(1,1,1,1) |