diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-05-30 13:26:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-02 13:49:42 +0200 |
| commit | eb71d505f5a20b6022ad130a4deda3a1e5c3fa4d (patch) | |
| tree | d0b5adadc67990c43f6518b81d56270560ae6e19 | |
| parent | 82a0a8244a2edf27c196f6c8cc3e2c36a3f4a8c5 (diff) | |
| download | qtquickcontrols-eb71d505f5a20b6022ad130a4deda3a1e5c3fa4d.tar.gz | |
Dialogs: don't allow click passthrough when a dialog is showing
On Android and other non-windowing platforms, clicking outside the
dialog dismisses it if it is non-modal, but if it is modal we still
need to capture the click even though it will not dismiss the dialog.
Task-number: QTBUG-39339
Change-Id: I18e892d1ca9c7ed4bea44c462a84b48ca44915d0
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| -rw-r--r-- | src/dialogs/qml/DefaultWindowDecoration.qml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/dialogs/qml/DefaultWindowDecoration.qml b/src/dialogs/qml/DefaultWindowDecoration.qml index 64eb4387..9b006698 100644 --- a/src/dialogs/qml/DefaultWindowDecoration.qml +++ b/src/dialogs/qml/DefaultWindowDecoration.qml @@ -1,6 +1,6 @@ /***************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQuick.Dialogs module of the Qt Toolkit. @@ -49,8 +49,7 @@ Rectangle { signal dismissed MouseArea { anchors.fill: parent - enabled: dismissOnOuterClick - onClicked: dismissed() + onClicked: if (dismissOnOuterClick) dismissed() BorderImage { id: borderImage property Item content |