Fixed|libdeng2|RuleRectangle: Rule invalidation issue

Related outputs of a rule rectangle (e.g., top affects height & bottom) need to be invalidated regardless of whether the output itself already is invalid. Fixes a problem where accessing only a certain output of a rule rectangle wouldn't cause the relevant value updates to occur (DocumentWidget inside a popup).
skyjake · Jul 31, 2013 · 0f1656b · 0f1656b
1 parent 6ba1f8c
commit 0f1656b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/doomsday/libdeng2/src/widgets/delegaterule.cpp b/doomsday/libdeng2/src/widgets/delegaterule.cpp
@@ -53,11 +53,11 @@ void DelegateRule::invalidate()
     if(isValid())
     {
         Rule::invalidate();
+    }
 
-        if(_source)
-        {
-            _source->delegateInvalidation(_delegateId);
-        }
+    if(_source)
+    {
+        _source->delegateInvalidation(_delegateId);
     }
 }
 

diff --git a/doomsday/libdeng2/src/widgets/rulerectangle.cpp b/doomsday/libdeng2/src/widgets/rulerectangle.cpp
@@ -305,33 +305,45 @@ public DelegateRule::ISource
         switch(id)
         {
         case OutLeft:
-            outputRules[OutRight]->invalidate();
-            outputRules[OutWidth]->invalidate();
+            if(outputRules[OutRight]->isValid())
+                outputRules[OutRight]->invalidate();
+            if(outputRules[OutWidth]->isValid())
+                outputRules[OutWidth]->invalidate();
             break;
 
         case OutRight:
-            outputRules[OutLeft]->invalidate();
-            outputRules[OutWidth]->invalidate();
+            if(outputRules[OutLeft]->isValid())
+                outputRules[OutLeft]->invalidate();
+            if(outputRules[OutWidth]->isValid())
+                outputRules[OutWidth]->invalidate();
             break;
 
         case OutWidth:
-            outputRules[OutLeft]->invalidate();
-            outputRules[OutRight]->invalidate();
+            if(outputRules[OutLeft]->isValid())
+                outputRules[OutLeft]->invalidate();
+            if(outputRules[OutRight]->isValid())
+                outputRules[OutRight]->invalidate();
             break;
 
         case OutTop:
-            outputRules[OutBottom]->invalidate();
-            outputRules[OutHeight]->invalidate();
+            if(outputRules[OutBottom]->isValid())
+                outputRules[OutBottom]->invalidate();
+            if(outputRules[OutHeight]->isValid())
+                outputRules[OutHeight]->invalidate();
             break;
 
         case OutBottom:
-            outputRules[OutTop]->invalidate();
-            outputRules[OutHeight]->invalidate();
+            if(outputRules[OutTop]->isValid())
+                outputRules[OutTop]->invalidate();
+            if(outputRules[OutHeight]->isValid())
+                outputRules[OutHeight]->invalidate();
             break;
 
         case OutHeight:
-            outputRules[OutTop]->invalidate();
-            outputRules[OutBottom]->invalidate();
+            if(outputRules[OutTop]->isValid())
+                outputRules[OutTop]->invalidate();
+            if(outputRules[OutBottom]->isValid())
+                outputRules[OutBottom]->invalidate();
             break;
         }
     }