From b68bbca6c8ad397e913c48c0ed8aec10953929b7 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 31 Jan 2014 20:03:33 +0100 Subject: [PATCH] check for validity --- src/declarativeimports/core/dialog.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/declarativeimports/core/dialog.cpp b/src/declarativeimports/core/dialog.cpp index a4f5d23d0..80cb674e4 100644 --- a/src/declarativeimports/core/dialog.cpp +++ b/src/declarativeimports/core/dialog.cpp @@ -613,7 +613,12 @@ void DialogProxy::updateMinimumHeight() void DialogProxy::updateMaximumWidth() { if (m_mainItemLayout) { - setMaximumWidth(m_mainItemLayout.data()->property("maximumWidth").toInt()); + const int hint = m_mainItemLayout.data()->property("maximumWidth").toInt(); + if (hint > 0) { + setMaximumWidth(hint); + } else { + setMaximumWidth(DIALOGSIZE_MAX); + } } else { setMaximumWidth(DIALOGSIZE_MAX); } @@ -622,7 +627,12 @@ void DialogProxy::updateMaximumWidth() void DialogProxy::updateMaximumHeight() { if (m_mainItemLayout) { - setMaximumHeight(m_mainItemLayout.data()->property("maximumWidth").toInt()); + const int hint = m_mainItemLayout.data()->property("maximumHeight").toInt(); + if (hint > 0) { + setMaximumWidth(hint); + } else { + setMaximumWidth(DIALOGSIZE_MAX); + } } else { setMaximumHeight(DIALOGSIZE_MAX); }