summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2014-04-08 17:36:11 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-09 07:42:35 +0200
commit59a6cb0b5ebdd5eae0152a9b34c1504006a7ccea (patch)
tree7903a33c62c79f6389360904d96e207afab4c666
parent781badd1b01fa029160bf567935543fe75a9b700 (diff)
downloadqtquickcontrols-59a6cb0b5ebdd5eae0152a9b34c1504006a7ccea.tar.gz
Dialogs: modality applies to fake window decorations too
For the sake of consistency with dialog behavior on desktop platforms, when a modal dialog is shown on a display that doesn't support windows, and therefore fake window decorations are used to make the dialog look like a Window while actually being an Item in the same scene graph, you can't dismiss it by tapping outside. If it's non-modal you can. [ChangeLog][QtQuick][Dialogs]when a modal dialog is shown on a display that doesn't support windows, you can't dismiss it by tapping outside Task-number: QTBUG-37860 Change-Id: I1150f53774f5d70e88e2b2f5a9d3524a8a00dbec Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r--src/dialogs/qquickabstractdialog.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dialogs/qquickabstractdialog.cpp b/src/dialogs/qquickabstractdialog.cpp
index 92bad9bf..62d59c19 100644
--- a/src/dialogs/qquickabstractdialog.cpp
+++ b/src/dialogs/qquickabstractdialog.cpp
@@ -161,6 +161,7 @@ void QQuickAbstractDialog::setVisible(bool v)
}
}
if (m_windowDecoration) {
+ m_windowDecoration->setProperty("dismissOnOuterClick", (m_modality == Qt::NonModal));
m_windowDecoration->setVisible(v);
} else if (m_dialogWindow) {
if (v) {