[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/plasma/extenders
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-09-20 19:25:30
Message-ID: 20100920192530.9257FAC7CB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1177632 by mart:

IMPROVEMENT: when searcing for our hostApplet, always look for the extenders's applet \
before, it is slightly faster and -partly- fixes the inability of detecting the host \
applet when it is an applet-in-applet, like the systray


 M  +4 -0      extender.cpp  
 M  +4 -0      extenderitem.cpp  


--- trunk/KDE/kdelibs/plasma/extenders/extender.cpp #1177631:1177632
@@ -699,6 +699,9 @@
             if (containment) {
                 Corona *corona = containment->corona();
 
+                if (sourceAppletId == q->applet()->id()) {
+                    sourceApplet = q->applet();
+                } else {
                 foreach (Containment *containment, corona->containments()) {
                     foreach (Applet *applet, containment->applets()) {
                         if (applet->id() == sourceAppletId) {
@@ -708,6 +711,7 @@
                 }
             }
         }
+        }
 
         //There is no source applet. We just instantiate one just for the sake of \
creating  //detachables.
--- trunk/KDE/kdelibs/plasma/extenders/extenderitem.cpp #1177631:1177632
@@ -175,6 +175,9 @@
 
         //Find the sourceapplet.
         Corona *corona = hostExtender->d->applet.data()->containment()->corona();
+        if (sourceAppletId == hostExtender->applet()->id()) {
+            d->sourceApplet = hostExtender->applet();
+        } else {
         foreach (Containment *containment, corona->containments()) {
             foreach (Applet *applet, containment->applets()) {
                 if (applet->id() == sourceAppletId &&
@@ -184,6 +187,7 @@
             }
         }
     }
+    }
 
     //make sure we keep monitoring if the source applet still exists, so the return \
to source icon  //can be hidden if it is removed.


[prev in list] [next in list] [prev in thread] [next in thread]