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 da33801..da724d8 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;
 
+import java.util.function.Consumer;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 
 import era.mi.gui.model.ViewModel;
 import era.mi.gui.model.components.GUIComponent;
+import era.mi.gui.model.wires.GUIWire;
 import era.mi.gui.model.wires.Pin;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
@@ -27,8 +30,47 @@ public class LogicUICanvas extends ZoomableCanvas
 
                this.model = model;
 
-               model.addComponentAddedListener(c -> redrawThreadsafe());
-               model.addWireAddedListener(c -> redrawThreadsafe());
+               Consumer<Object> redrawConsumer = o -> redrawThreadsafe();
+               Consumer<Pin> pinAddedListener = p ->
+               {
+                       p.addPinMovedListener(redrawConsumer);
+                       redrawThreadsafe();
+               };
+               Consumer<Pin> pinRemovedListener = p ->
+               {
+                       p.removePinMovedListener(redrawConsumer);
+                       redrawThreadsafe();
+               };
+               Consumer<? super GUIComponent> componentAddedListener = c ->
+               {
+                       c.addComponentLookChangedListener(redrawConsumer);
+                       c.addComponentMovedListener(redrawConsumer);
+                       c.addPinAddedListener(pinAddedListener);
+                       c.addPinRemovedListener(pinRemovedListener);
+                       redrawThreadsafe();
+               };
+               model.addComponentAddedListener(componentAddedListener);
+               model.getComponents().forEach(componentAddedListener);
+               model.addComponentRemovedListener(c ->
+               {
+                       c.removeComponentLookChangedListener(redrawConsumer);
+                       c.removeComponentMovedListener(redrawConsumer);
+                       c.removePinAddedListener(pinAddedListener);
+                       c.removePinRemovedListener(pinRemovedListener);
+                       redrawThreadsafe();
+               });
+               Consumer<? super GUIWire> wireAddedListener = w ->
+               {
+                       w.addWireLookChangedListener(redrawConsumer);
+                       redrawThreadsafe();
+               };
+               model.addWireAddedListener(wireAddedListener);
+               model.getWires().forEach(wireAddedListener);
+               model.addWireRemovedListener(w ->
+               {
+                       w.removeWireLookChangedListener(redrawConsumer);
+                       redrawThreadsafe();
+               });
 
                addZoomedRenderer(gc ->
                {
@@ -42,7 +84,7 @@ public class LogicUICanvas extends ZoomableCanvas
        private void drawComponent(GeneralGC gc, GUIComponent component, Rectangle visibleRegion)
        {
                component.render(gc, visibleRegion);
-               gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_CYAN));
+               gc.setBackground(getDisplay().getSystemColor(SWT.COLOR_DARK_CYAN));
                for (Pin p : component.getPins())
                {
                        Point pos = p.getPos();