Found the redrawing bug mentioned in the last commit

[Mograsim.git] / LogicUI / src / era / mi / gui / LogicUICanvas.java

diff --git a/LogicUI/src/era/mi/gui/LogicUICanvas.java b/LogicUI/src/era/mi/gui/LogicUICanvas.java
index f94a047..18d424d 100644 (file)
--- a/LogicUI/src/era/mi/gui/LogicUICanvas.java
+++ b/LogicUI/src/era/mi/gui/LogicUICanvas.java
@@ -1,5 +1,7 @@
 package era.mi.gui;\r
 \r
+import java.util.function.Consumer;\r
+\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Event;\r
@@ -27,10 +29,44 @@ public class LogicUICanvas extends ZoomableCanvas
 \r
                this.model = model;\r
 \r
-               model.addComponentAddedListener(c -> redrawThreadsafe());\r
-               model.addWireAddedListener(c -> redrawThreadsafe());\r
-               model.addComponentRemovedListener(c -> redrawThreadsafe());\r
-               model.addWireRemovedListener(c -> redrawThreadsafe());\r
+               Consumer<Object> redrawConsumer = o -> redrawThreadsafe();\r
+               Consumer<Pin> pinAddedListener = p ->\r
+               {\r
+                       p.addPinMovedListener(redrawConsumer);\r
+                       redrawThreadsafe();\r
+               };\r
+               Consumer<Pin> pinRemovedListener = p ->\r
+               {\r
+                       p.removePinMovedListener(redrawConsumer);\r
+                       redrawThreadsafe();\r
+               };\r
+               model.addComponentAddedListener(c ->\r
+               {\r
+                       c.addComponentLookChangedListener(redrawConsumer);\r
+                       c.addComponentMovedListener(redrawConsumer);\r
+                       c.addPinAddedListener(pinAddedListener);\r
+                       c.addPinRemovedListener(pinRemovedListener);\r
+                       redrawThreadsafe();\r
+               });\r
+               model.addComponentRemovedListener(c ->\r
+               {\r
+                       c.removeComponentLookChangedListener(redrawConsumer);\r
+                       c.removeComponentMovedListener(redrawConsumer);\r
+                       c.removePinAddedListener(pinAddedListener);\r
+                       c.removePinRemovedListener(pinRemovedListener);\r
+                       redrawThreadsafe();\r
+               });\r
+               model.addWireAddedListener(w ->\r
+               {\r
+                       w.addWireLookChangedListener(redrawConsumer);\r
+                       redrawThreadsafe();\r
+               });\r
+               model.addWireRemovedListener(w ->\r
+               {\r
+                       w.removeWireLookChangedListener(redrawConsumer);\r
+                       redrawThreadsafe();\r
+               });\r
+               // TODO add listeners for existing components & wires\r
 \r
                addZoomedRenderer(gc ->\r
                {\r