summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Endrodi <ext-adam.endrodi@nokia.com>2010-10-20 13:52:08 +0300
committerAdam Endrodi <ext-adam.endrodi@nokia.com>2010-10-20 13:52:08 +0300
commit2131a71224a0e468ee334cc7b92ba37feaaee97d (patch)
treeab0cc4a916e764691e79b79909d93571621aa4d5
parent25376030b5cfe3b3bd9f0541eb5d8a72f7012875 (diff)
Fixes: NB#198346 - Not able to answer coming calls when device lock activated
call-ui changed its _MEEGO_STACKING_LAYER which made its WM_STATE change to Normal, which confused Qt because it expected Withdrawn when the window was show()n. * src/mcompositemanager.cpp (MCompositeManagerPrivate::setWindowState): Don't touch WM_STATE if the window is not mapped, especially not to NormalState.
-rw-r--r--src/mcompositemanager.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp
index 66b1a1b..0c514a5 100644
--- a/src/mcompositemanager.cpp
+++ b/src/mcompositemanager.cpp
@@ -2734,7 +2734,11 @@ void MCompositeManagerPrivate::setWindowState(Window w, int state)
MCompositeWindow* i = COMPOSITE_WINDOW(w);
if(i && i->propertyCache()->windowState() == state)
return;
- else if (i)
+ else if (i && !i->isMapped()
+ && (state == NormalState || state == IconicState)) {
+ /* qWarning("fuck you"); // courtesy by kuzak */
+ return;
+ } else if (i)
// cannot wait for the property change notification
i->propertyCache()->setWindowState(state);