KDE/kdelibs/plasma

[Chani Armitage]

SVN commit 1067596 by chani:

give wallpaper priority over containmentactions in all events

CCMAIL: plasma-devel at kde.org
note that the wallpaper is only getting wheel events and move events
when itemAt != this, which is different from the "if there's no applet
there" logic that's used for containmentactions stuff. this could
have... odd... effects for containments that use graphicsitems, like
folderview.
in general it seems like this code's gotten crufty and could do with
some cleanup, once someone decides what the 'proper' behaviour actually
is.

 M  +10 -10    containment.cpp  


--- trunk/KDE/kdelibs/plasma/containment.cpp #1067595:1067596
@@ -1639,16 +1639,6 @@
         return; //no unexpected click-throughs
     }
 
-    QString trigger = ContainmentActions::eventToString(event);
-
-    if (d->actionPlugins.contains(trigger)) {
-        if (d->prepareContainmentActions(trigger, event->screenPos())) {
-            d->actionPlugins.value(trigger)->contextEvent(event);
-        }
-        event->accept();
-        return;
-    }
-
     if (d->wallpaper && d->wallpaper->isInitialized()) {
         QGraphicsItem *item = scene()->itemAt(event->scenePos());
         if (item == this) {
@@ -1661,6 +1651,16 @@
         }
     }
 
+    QString trigger = ContainmentActions::eventToString(event);
+
+    if (d->actionPlugins.contains(trigger)) {
+        if (d->prepareContainmentActions(trigger, event->screenPos())) {
+            d->actionPlugins.value(trigger)->contextEvent(event);
+        }
+        event->accept();
+        return;
+    }
+
     event->ignore();
     Applet::wheelEvent(event);
 }