From f75aa977283cac76980ed75462afba75853ea7d2 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 15 Mar 2016 07:22:21 +1300
Subject: [PATCH] Grow width of QML message box to accommodate wide title if
necessary
---
interface/resources/qml/dialogs/MessageDialog.qml | 5 ++++-
interface/resources/qml/windows-uit/ModalFrame.qml | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/interface/resources/qml/dialogs/MessageDialog.qml b/interface/resources/qml/dialogs/MessageDialog.qml
index fa702090d3..ced92176c3 100644
--- a/interface/resources/qml/dialogs/MessageDialog.qml
+++ b/interface/resources/qml/dialogs/MessageDialog.qml
@@ -51,6 +51,9 @@ ModalWindow {
property int clickedButton: OriginalDialogs.StandardButton.NoButton;
focus: defaultButton === OriginalDialogs.StandardButton.NoButton
+ property int titleWidth: 0
+ onTitleWidthChanged: d.resize();
+
function updateIcon() {
if (!root) {
return;
@@ -72,7 +75,7 @@ ModalWindow {
readonly property int maxHeight: 720
function resize() {
- var targetWidth = mainTextContainer.width
+ var targetWidth = Math.max(titleWidth, mainTextContainer.width)
var targetHeight = mainTextContainer.height + 3 * hifi.dimensions.contentSpacing.y
+ (informativeTextContainer.text != "" ? informativeTextContainer.contentHeight + 3 * hifi.dimensions.contentSpacing.y : 0)
+ buttons.height
diff --git a/interface/resources/qml/windows-uit/ModalFrame.qml b/interface/resources/qml/windows-uit/ModalFrame.qml
index 5c6556021e..77344829d5 100644
--- a/interface/resources/qml/windows-uit/ModalFrame.qml
+++ b/interface/resources/qml/windows-uit/ModalFrame.qml
@@ -50,6 +50,8 @@ Frame {
width: title.width + (icon.text !== "" ? icon.width + hifi.dimensions.contentSpacing.x : 0)
x: (parent.width - width) / 2
+ onWidthChanged: window.titleWidth = width
+
HiFiGlyphs {
id: icon
text: window.iconText ? window.iconText : ""