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

List:       kde-commits
Subject:    branches/KDE/4.4/kdebase/workspace/plasma/generic/applets/systemtray
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-04-23 16:38:00
Message-ID: 20100423163800.63066AC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1117985 by mart:

backport r1117982
forward constraints only to plasmoids belonging the proper systray


 M  +2 -2      core/manager.cpp  
 M  +1 -1      core/manager.h  
 M  +3 -3      protocols/plasmoid/plasmoidtaskprotocol.cpp  
 M  +1 -1      protocols/plasmoid/plasmoidtaskprotocol.h  
 M  +1 -1      ui/applet.cpp  


--- branches/KDE/4.4/kdebase/workspace/plasma/generic/applets/systemtray/core/manager.cpp \
#1117984:1117985 @@ -244,9 +244,9 @@
     return d->jobs;
 }
 
-void Manager::forwardConstraintsEvent(Plasma::Constraints constraints)
+void Manager::forwardConstraintsEvent(Plasma::Constraints constraints, \
Plasma::Applet *host)  {
-    d->plasmoidProtocol->forwardConstraintsEvent(constraints);
+    d->plasmoidProtocol->forwardConstraintsEvent(constraints, host);
 }
 
 void Manager::loadApplets(const KConfigGroup &cg, Plasma::Applet *parent)
--- branches/KDE/4.4/kdebase/workspace/plasma/generic/applets/systemtray/core/manager.h \
#1117984:1117985 @@ -103,7 +103,7 @@
      **/
     void unregisterNotificationProtocol();
 
-    void forwardConstraintsEvent(Plasma::Constraints constraints);
+    void forwardConstraintsEvent(Plasma::Constraints constraints, Plasma::Applet \
*host);  
     void loadApplets(const KConfigGroup &cg, Plasma::Applet *parent);
 
--- branches/KDE/4.4/kdebase/workspace/plasma/generic/applets/systemtray/protocols/plasmoid/plasmoidtaskprotocol.cpp \
#1117984:1117985 @@ -46,10 +46,10 @@
 {
 }
 
-void PlasmoidProtocol::forwardConstraintsEvent(Plasma::Constraints constraints)
+void PlasmoidProtocol::forwardConstraintsEvent(Plasma::Constraints constraints, \
Plasma::Applet *host)  {
-    typedef QHash<QString, PlasmoidTask*> TfoType;
-    foreach (TfoType tasksForHost, m_tasks) {
+    if (m_tasks.contains(host)) {
+        QHash<QString, PlasmoidTask*> tasksForHost = m_tasks.value(host);
         foreach (PlasmoidTask *task, tasksForHost) {
             task->forwardConstraintsEvent(constraints);
         }
--- branches/KDE/4.4/kdebase/workspace/plasma/generic/applets/systemtray/protocols/plasmoid/plasmoidtaskprotocol.h \
#1117984:1117985 @@ -46,7 +46,7 @@
 
     void init();
 
-    void forwardConstraintsEvent(Plasma::Constraints constraints);
+    void forwardConstraintsEvent(Plasma::Constraints constraints, Plasma::Applet \
*host);  void loadFromConfig(const KConfigGroup &cg, Plasma::Applet *parent);
     void addApplet(const QString appletName, const int id, Plasma::Applet *parent);
     void removeApplet(const QString appletName, Plasma::Applet *parent);
--- branches/KDE/4.4/kdebase/workspace/plasma/generic/applets/systemtray/ui/applet.cpp \
#1117984:1117985 @@ -392,7 +392,7 @@
         checkSizes();
     }
 
-    s_manager->forwardConstraintsEvent(constraints);
+    s_manager->forwardConstraintsEvent(constraints, this);
 }
 
 SystemTray::Manager *Applet::manager() const


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