diff options
author | Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> | 2010-11-22 18:34:19 +0200 |
---|---|---|
committer | Abdiel Janulgue <abdiel.janulgue@nokia.com> | 2010-11-23 14:11:47 +0200 |
commit | 0044995484a6312094abc0e3a897ed9d1536be36 (patch) | |
tree | 53f8e385afe7dd414ca8db95893083830c00eeb5 | |
parent | 5dc7bbb68e13c18a12db114db12b27f70efa45b8 (diff) |
Fixes: NB#205707 - System dialogs are not shown
- mark them visible because the animation does not do it
-rw-r--r-- | src/mcompositemanager.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp index d8d6efd..aff6cee 100644 --- a/src/mcompositemanager.cpp +++ b/src/mcompositemanager.cpp @@ -2257,10 +2257,13 @@ void MCompositeManagerPrivate::mapEvent(XMapEvent *e) && !pc->alwaysMapped() && e->send_event == False && !pc->isInputOnly()) { // remapped/prestarted apps should also have startup animation + // FIXME: assumes this window is on top item->requestZValue(scene()->items().count() + 1); item->setNewlyMapped(true); - if (!item->showWindow()) + if (!item->showWindow()) { item->setNewlyMapped(false); + item->setVisible(true); + } } else { item->setNewlyMapped(false); item->setVisible(true); @@ -2283,9 +2286,12 @@ void MCompositeManagerPrivate::mapEvent(XMapEvent *e) const XWMHints &h = pc->getWMHints(); if ((!(h.flags & StateHint) || h.initial_state != IconicState) && !pc->alwaysMapped() && e->send_event == False - && !pc->isInputOnly() && item->isAppWindow()) - item->showWindow(); - else { + && !pc->isInputOnly() && item->isAppWindow()) { + if (!item->showWindow()) { + item->setNewlyMapped(false); + item->setVisible(true); + } + } else { item->setNewlyMapped(false); item->setVisible(true); } |