summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-12-08 17:40:43 +0200
committerAdam Endrodi <ext-adam.endrodi@nokia.com>2010-12-14 15:44:25 +0200
commitf16eb62bff723990e5b3e94f8d2f1e1bda89f1aa (patch)
treedccecec02a3a7170b561cdb356d9fafdbbec39e1
parent311de2a92541db0e4fb41340a1e67f0b20548d31 (diff)
Fixes: NB#209506 - Changing layer of a minimized MApplicationWindow causes the window to be restored from switcher
- don't raise the window having Meego stacking layer change unless it's in NormalState
-rw-r--r--src/mwindowpropertycache.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mwindowpropertycache.cpp b/src/mwindowpropertycache.cpp
index 52d19a6..96cd59d 100644
--- a/src/mwindowpropertycache.cpp
+++ b/src/mwindowpropertycache.cpp
@@ -681,9 +681,11 @@ bool MWindowPropertyCache::propertyEvent(XPropertyEvent *e)
xcb_meego_layer_cookie = xcb_get_property(xcb_conn, 0, window,
ATOM(_MEEGO_STACKING_LAYER),
XCB_ATOM_CARDINAL, 0, 1);
- // raise it so that it becomes on top of same-leveled windows
- MCompositeManager *m = (MCompositeManager*)qApp;
- m->d->positionWindow(window, true);
+ if (window_state == NormalState) {
+ // raise it so that it becomes on top of same-leveled windows
+ MCompositeManager *m = (MCompositeManager*)qApp;
+ m->d->positionWindow(window, true);
+ }
return true;
} else if (e->atom == ATOM(_MEEGOTOUCH_CUSTOM_REGION)) {
emit customRegionChanged(this);