WireCrossPoint now renders at the correct location

[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..fb73405 100644 (file)
--- a/LogicUI/src/era/mi/gui/LogicUICanvas.java
+++ b/LogicUI/src/era/mi/gui/LogicUICanvas.java
@@ -1,11 +1,14 @@
 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
 \r
 import era.mi.gui.model.ViewModel;\r
 import era.mi.gui.model.components.GUIComponent;\r
+import era.mi.gui.model.wires.GUIWire;\r
 import era.mi.gui.model.wires.Pin;\r
 import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;\r
@@ -27,10 +30,47 @@ 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
+               Consumer<? super GUIComponent> componentAddedListener = c ->\r
+               {\r
+                       c.addComponentLookChangedListener(redrawConsumer);\r
+                       c.addComponentMovedListener(redrawConsumer);\r
+                       c.addPinAddedListener(pinAddedListener);\r
+                       c.addPinRemovedListener(pinRemovedListener);\r
+                       redrawThreadsafe();\r
+               };\r
+               model.addComponentAddedListener(componentAddedListener);\r
+               model.getComponents().forEach(componentAddedListener);\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
+               Consumer<? super GUIWire> wireAddedListener = w ->\r
+               {\r
+                       w.addWireLookChangedListener(redrawConsumer);\r
+                       redrawThreadsafe();\r
+               };\r
+               model.addWireAddedListener(wireAddedListener);\r
+               model.getWires().forEach(wireAddedListener);\r
+               model.addWireRemovedListener(w ->\r
+               {\r
+                       w.removeWireLookChangedListener(redrawConsumer);\r
+                       redrawThreadsafe();\r
+               });\r
 \r
                addZoomedRenderer(gc ->\r
                {\r
@@ -44,7 +84,7 @@ public class LogicUICanvas extends ZoomableCanvas
        private void drawComponent(GeneralGC gc, GUIComponent component, Rectangle visibleRegion)\r
        {\r
                component.render(gc, visibleRegion);\r
-               gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_CYAN));\r
+               gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_DARK_CYAN));\r
                for (Pin p : component.getPins())\r
                {\r
                        Point pos = p.getPos();\r