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

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/plasma
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-02-29 22:17:56
Message-ID: 1204323476.542010.16935.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780750 by aseigo:

put the applet notification of immutability in the containment


 M  +8 -6      containment.cpp  
 M  +0 -4      corona.cpp  


--- trunk/KDE/kdebase/workspace/libs/plasma/containment.cpp #780749:780750
@@ -176,14 +176,16 @@
 void Containment::containmentConstraintsUpdated(Plasma::Constraints constraints)
 {
     //kDebug() << "got containmentConstraintsUpdated" << constraints << (QObject*)d->toolbox;
-    if (d->toolbox) {
-        if (constraints & Plasma::ScreenConstraint) {
-            d->toolbox->setPos(geometry().width() - d->toolbox->boundingRect().width(), 0);
+    if (constraints & Plasma::ImmutableConstraint) {
+        // tell the applets too
+        foreach (Applet *a, d->applets) {
+            a->constraintsUpdated(ImmutableConstraint);
         }
+    }
 
-        if (constraints & Plasma::ImmutableConstraint) {
-            d->toolbox->enableTool("addwidgets", !isImmutable());
-        }
+    if (constraints & Plasma::ScreenConstraint && d->toolbox) {
+        d->toolbox->setPos(geometry().width() - d->toolbox->boundingRect().width(), 0);
+        d->toolbox->enableTool("addwidgets", !isImmutable());
     }
 }
 
--- trunk/KDE/kdebase/workspace/libs/plasma/corona.cpp #780749:780750
@@ -97,10 +97,6 @@
         foreach (Containment *c, containments) {
             // we need to tell each containment that immutability has been altered
             c->updateConstraints(ImmutableConstraint);
-            // tell the applets too
-            foreach (Applet *a, c->applets()) {
-                a->constraintsUpdated(ImmutableConstraint);
-            }
         }
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]