summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-12-15 11:30:12 +0200
committerAdam Endrodi <ext-adam.endrodi@nokia.com>2011-01-05 16:10:01 +0200
commitd399fc5d09063b1767d67d53ca23a41958dc37f9 (patch)
tree0e0f4e96f931b0a4904a2e82cf70279c57dbb906
parentbfcefaf17e55202a40c76cf507afcc9d6c52ac99 (diff)
Fixes: NB#206559 - The QDialog items don't draw correctly
- decorate transient (non-LMT) dialogs also - fix decorator raising/lowering to not depend on the current application Conflicts: src/mcompositemanager.cpp
-rw-r--r--src/mcompositemanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp
index 131e8d1..5ee91f7 100644
--- a/src/mcompositemanager.cpp
+++ b/src/mcompositemanager.cpp
@@ -2121,7 +2121,7 @@ void MCompositeManagerPrivate::checkStacking(bool force_visibility_check,
deco->decoratorItem()->setVisible(true);
glwidget->update();
}
- } else if (!highest_d || top_decorated_i < 0) {
+ } else if ((!highest_d || top_decorated_i < 0) && deco->decoratorItem()) {
Window deco_w = deco->decoratorItem()->window();
int deco_i = stacking_list.indexOf(deco_w);
if (deco_i > 0) {