From b46189c3c3a92c9093bd05bf976b2e7a368511a3 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Thu, 26 Apr 2012 13:32:14 +0200 Subject: Support all modality types in QPlatformDialogHelper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modality is not a boolean property in Qt. There are 2 types: window modality and application modality. Native dialogs can support both of these types as well (e.g. on Cocoa, a window modal file dialog should be displayed as a Sheet). Remove the QPlatformDialogHelper::ShowFlags enum and instead pass a Qt::WindowModality parameter to QPlatformDialogHelper::show_sys(). The Windows implementation has been updated to check for Qt::ApplicationModal instead of the ShowModal flag (since only Qt::ApplicationModal dialogs are blocking). The Cocoa implementation has been updated to only use non-modal and application modal native color and font dialogs (which restores Qt 4 behavior). These are shared Cocoa panels that cannot be shown as sheets, however. If the programmer asks for window modal color/font dialogs, we use the Qt versions, not the native ones. The file dialog can be shown either as a Sheet (but we need to pass an NSWindow parent for it to work properly) or as an application modal dialog. This change has been tested on Mac OS X with tests/manual/windowmodality. Change-Id: I9064987433895c55f68aac979ef8e8207fb24bbe Reviewed-by: Friedemann Kleint Reviewed-by: Morten Johan Sørvig --- src/widgets/dialogs/qdialog.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index df76d0af0e..718d64bd27 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -108,11 +108,9 @@ bool QDialogPrivate::setNativeDialogVisible(bool visible) { if (QPlatformDialogHelper *helper = platformHelper()) { if (visible) { + Q_Q(QDialog); helperPrepareShow(helper); - QPlatformDialogHelper::ShowFlags flags(0); - if (q_func()->isModal()) - flags |= QPlatformDialogHelper::ShowModal; - nativeDialogInUse = helper->show_sys(flags, q_func()->windowFlags(), parentWindow()); + nativeDialogInUse = helper->show_sys(q->windowFlags(), q->windowModality(), parentWindow()); } else { helper->hide_sys(); } -- cgit v1.2.3