Imagine: Use 16 pixels of margin, rather than 20 (for consistency)

Other imagine style dialogs use 16 pixel for the left and right margins,
for the footer. But for some reason, the font and message dialog used
20 pixels.

I included some padding for the message dialog "detailed text area" as
well, to make it prettier. As well as some margin between the buttons
and the detailed text.

Change-Id: I3911b13fb8b3d9f117673cdb20a3e5ff5a1edcac
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 3412b750dab2534c03b9f9d86c3a287705fe3332)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

2 files changed, 12 insertions, 9 deletions

diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FontDialog.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FontDialog.qml
index 9d40f97431..cb58015ae3 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FontDialog.qml
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/FontDialog.qml
@@ -149,7 +149,7 @@ FontDialogImpl {
 
         Label {
             text: qsTr("Writing System")
-            Layout.leftMargin: 20
+            Layout.leftMargin: 16
             Layout.bottomMargin: 16
         }
         ComboBox{
@@ -163,7 +163,7 @@ FontDialogImpl {
             id: buttonBox
             standardButtons: control.standardButtons
             spacing: 12
-            Layout.rightMargin: 20
+            Layout.rightMargin: 16
             Layout.bottomMargin: 16
         }
     }
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml
index e6d7b9606f..2f0b31ada7 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml
@@ -135,7 +135,7 @@ MessageDialogImpl {
                 objectName: "detailedTextButton"
                 text: control.showDetailedText ? qsTr("Hide Details...") : qsTr("Show Details...")
 
-                Layout.leftMargin: 20
+                Layout.leftMargin: 16
             }
 
             DialogButtonBox {
@@ -146,9 +146,11 @@ MessageDialogImpl {
                 verticalPadding: 20
 
                 Layout.fillWidth: true
-                Layout.leftMargin: detailedTextButton.visible ? 12 : 20
-                Layout.rightMargin: 20
+                Layout.leftMargin: detailedTextButton.visible ? 12 : 16
+                Layout.rightMargin: 16
             }
+
+            Layout.bottomMargin: 16
         }
 
         TextArea {
@@ -159,10 +161,12 @@ MessageDialogImpl {
             wrapMode: TextEdit.WordWrap
             readOnly: true
 
+            padding: 12
+
             Layout.fillWidth: true
-            Layout.leftMargin: 20
-            Layout.rightMargin: 20
-            Layout.bottomMargin: 20
+            Layout.leftMargin: 16
+            Layout.rightMargin: 16
+            Layout.bottomMargin: 16
 
             background: Rectangle {
                 color: Qt.rgba(1,1,1,1)
@@ -170,7 +174,6 @@ MessageDialogImpl {
                 border.color: Qt.darker(control.palette.light)
                 border.width: 1
             }
-
         }
     }