--- a/doodle/fig/diagram_layer.d	Thu Aug 19 18:28:18 2010 +0930
+++ b/doodle/fig/diagram_layer.d	Fri Aug 20 18:34:32 2010 +0930
@@ -20,6 +20,9 @@
     // Layer overrides:
 
     override Rectangle bounds() const {
+        // Take the union of all diagram element bounds
+        Rectangle bounds = Rectangle.DEFAULT;
+        foreach (element; _elements) { bounds = bounds | element.bounds; }
         return Rectangle.DEFAULT;
     }
 
@@ -27,7 +30,7 @@
                        in Rectangle modelDamage, scope Renderer modelRenderer,
                        in ScreenModel screenModel) const {
         foreach (e; _elements) {
-            if ((e.bounds & modelDamage).valid) {
+            if ((e.bounds & modelDamage).valid) {       // FIXME if (intersects(e.bounds, modelDamage))
                 e.draw(modelDamage, modelRenderer);
             }
         }