printing: Make sure window modality works with native print dialogs

Make the native QPrintDialogs and QPageSetupDialogs participate in the
Qt modality system. Even though we are overriding QDialog::setVisible()
and exec() to show the native dialgos, we want to still call into
QDialog::setVisible() so that modality state and events are properly
handled. We do this by setting the WA_DontShowOnScreen attribute on
QPrintDialog and QPageSetupDialog, and call QDialog::setVisible() at the
appropriate places.

Change-Id: I7d800790c40ba1f467c3315e29abb79a7fa0eb34
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/printsupport/dialogs/qprintdialog_win.cpp b/src/printsupport/dialogs/qprintdialog_win.cpp
index cc36e5eb8e..5474643de9 100644
--- a/src/printsupport/dialogs/qprintdialog_win.cpp
+++ b/src/printsupport/dialogs/qprintdialog_win.cpp
@@ -193,6 +193,7 @@ QPrintDialog::QPrintDialog(QPrinter *printer, QWidget *parent)
     if (!warnIfNotNative(d->printer))
         return;
     d->ep = static_cast<QWin32PrintEngine *>(d->printer->paintEngine())->d_func();
+    setAttribute(Qt::WA_DontShowOnScreen);
 }
 
 QPrintDialog::QPrintDialog(QWidget *parent)
@@ -202,6 +203,7 @@ QPrintDialog::QPrintDialog(QWidget *parent)
     if (!warnIfNotNative(d->printer))
         return;
     d->ep = static_cast<QWin32PrintEngine *>(d->printer->paintEngine())->d_func();
+    setAttribute(Qt::WA_DontShowOnScreen);
 }
 
 QPrintDialog::~QPrintDialog()
@@ -230,10 +232,7 @@ int QPrintDialogPrivate::openWindowsPrintDialogModally()
     if (parent == 0)
         parent = q;
 
-    QWidget modal_widget;
-    modal_widget.setAttribute(Qt::WA_NoChildEventsForParent, true);
-    modal_widget.setParent(parent, Qt::Window);
-    QApplicationPrivate::enterModal(&modal_widget);
+    q->QDialog::setVisible(true);
 
     HGLOBAL *tempDevNames = ep->createDevNames();
 
@@ -274,7 +273,7 @@ int QPrintDialogPrivate::openWindowsPrintDialogModally()
         }
     } while (!done);
 
-    QApplicationPrivate::leaveModal(&modal_widget);
+    q->QDialog::setVisible(false);
 
 //    qt_win_eatMouseMove();