aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Jablonski <maciej.jablonski@teleca.com>2010-11-05 13:06:43 +0100
committerDominik Kapusta <dominik.kapusta@teleca.com>2010-11-05 13:23:09 +0100
commit4f375477b887e1a3f1399428531a7e5e7196d69f (patch)
tree8bc3d1b8ea2968dc215a0cab610bb88c319024d2
parent6370c3504876ce27373ae6494483d42b8dab73c2 (diff)
Fixes: NB#202749 - MCompositor animates the windows for system modal dialogs
RevBy: Dominik
-rw-r--r--src/corelib/widgets/mdialog.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/widgets/mdialog.cpp b/src/corelib/widgets/mdialog.cpp
index 259a9a23..877a4a15 100644
--- a/src/corelib/widgets/mdialog.cpp
+++ b/src/corelib/widgets/mdialog.cpp
@@ -189,11 +189,11 @@ bool MDialogPrivate::prepareStandAloneAppearance(MSceneWindow::DeletionPolicy po
if(!q->model()->title().isEmpty())
standAloneWindow->setWindowTitle(q->model()->title());
#ifdef Q_WS_X11
- // System Dialog (unlike System Modal Dialog) has to be treated as a separate
- // window, in order to be able to reside in task switcher
- if (q->isSystem() && q->isModal()) {
+ if (q->isSystem()) {
standAloneWindow->setAttribute(Qt::WA_X11NetWmWindowTypeDialog, true);
- standAloneWindow->setWindowModality(Qt::WindowModal);
+ if (q->isModal()) {
+ standAloneWindow->setWindowModality(Qt::WindowModal);
+ }
}
#endif
q->connect(q, SIGNAL(disappeared()), SLOT(_q_onStandAloneDialogDisappeared()));