From a816d835d3129350eaa7488e52b39c606cfae350 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 24 Feb 2016 13:59:43 +1300
Subject: [PATCH] Finesse modal message box dialog layout

---
 interface/resources/qml/dialogs/MessageDialog.qml  | 14 +++++++-------
 .../resources/qml/styles-uit/HifiConstants.qml     |  2 +-
 interface/resources/qml/windows-uit/ModalFrame.qml | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/interface/resources/qml/dialogs/MessageDialog.qml b/interface/resources/qml/dialogs/MessageDialog.qml
index f31b5cf41d..21d17c4e54 100644
--- a/interface/resources/qml/dialogs/MessageDialog.qml
+++ b/interface/resources/qml/dialogs/MessageDialog.qml
@@ -89,8 +89,8 @@ ModalWindow {
 
             function resize() {
                 var targetWidth = mainTextContainer.width
-                var targetHeight = mainTextContainer.height + 4 * hifi.dimensions.contentSpacing.y
-                        + (informativeTextContainer.text != "" ? informativeTextContainer.contentHeight + hifi.dimensions.contentSpacing.y : 0)
+                var targetHeight = mainTextContainer.height + 3 * hifi.dimensions.contentSpacing.y
+                        + (informativeTextContainer.text != "" ? informativeTextContainer.contentHeight + 3 * hifi.dimensions.contentSpacing.y : 0)
                         + buttons.height
                         + (content.state === "expanded" ? details.implicitHeight + hifi.dimensions.contentSpacing.y : 0)
                 root.width = (targetWidth < d.minWidth) ? d.minWidth : ((targetWidth > d.maxWdith) ? d.maxWidth : targetWidth)
@@ -121,9 +121,9 @@ ModalWindow {
             size: hifi.fontSizes.menuItem
             color: hifi.colors.baseGrayHighlight
             anchors {
-                top: mainTextContainer.bottom;
-                left: parent.left;
-                right: parent.right;
+                top: mainTextContainer.bottom
+                left: parent.left
+                right: parent.right
                 margins: 0
                 topMargin: text != "" ? hifi.dimensions.contentSpacing.y : 0
             }
@@ -136,10 +136,10 @@ ModalWindow {
             onHeightChanged: d.resize(); onWidthChanged: d.resize();
             layoutDirection: Qt.RightToLeft
             anchors {
-                top: informativeTextContainer.bottom
+                top: informativeTextContainer.text == "" ? mainTextContainer.bottom : informativeTextContainer.bottom
                 horizontalCenter: parent.horizontalCenter
                 margins: 0
-                topMargin: hifi.dimensions.contentSpacing.y
+                topMargin: 2 * hifi.dimensions.contentSpacing.y
             }
             MessageDialogButton { dialog: root; text: qsTr("Close"); button: OriginalDialogs.StandardButton.Close; }
             MessageDialogButton { dialog: root; text: qsTr("Abort"); button: OriginalDialogs.StandardButton.Abort; }
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index e18380f492..77e74163c3 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -79,7 +79,7 @@ Item {
         readonly property real textPadding: 8
         readonly property real tablePadding: 12
         readonly property real tableRowHeight: largeScreen ? 26 : 23
-        readonly property real modalDialogMargin: 50
+        readonly property vector2d modalDialogMargin: Qt.vector2d(50, 30)
         readonly property real modalDialogTitleHeight: 40
     }
 
diff --git a/interface/resources/qml/windows-uit/ModalFrame.qml b/interface/resources/qml/windows-uit/ModalFrame.qml
index b76996a873..17b60061e8 100644
--- a/interface/resources/qml/windows-uit/ModalFrame.qml
+++ b/interface/resources/qml/windows-uit/ModalFrame.qml
@@ -25,10 +25,10 @@ Frame {
 
         Rectangle {
             anchors {
-                topMargin: -hifi.dimensions.modalDialogMargin - (modalFrame.hasTitle ? hifi.dimensions.modalDialogTitleHeight : 0)
-                leftMargin: -hifi.dimensions.modalDialogMargin
-                rightMargin: -hifi.dimensions.modalDialogMargin
-                bottomMargin: -hifi.dimensions.modalDialogMargin
+                topMargin: -hifi.dimensions.modalDialogMargin.y - (modalFrame.hasTitle ? hifi.dimensions.modalDialogTitleHeight + 10 : 0)
+                leftMargin: -hifi.dimensions.modalDialogMargin.x
+                rightMargin: -hifi.dimensions.modalDialogMargin.x
+                bottomMargin: -hifi.dimensions.modalDialogMargin.y
                 fill: parent
             }
             border {
@@ -50,7 +50,7 @@ Frame {
                 size: 30
                 color: hifi.colors.lightGrayText
                 visible: text != ""
-                y: -hifi.dimensions.modalDialogTitleHeight - 3
+                y: -hifi.dimensions.modalDialogTitleHeight - 5
                 anchors.left: parent.left
             }
             RalewayRegular {