X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2FLogicUICanvas.java;h=7faefe392f1a3d2b572a6203292ef07b56617a33;hb=86f2e11d28a4100a7fe142e103b7b5eeb9de4214;hp=da338013fe528388956f67920d90eb8fad149760;hpb=f2886cbd57dd08b797921fc2421b41bd92915799;p=Mograsim.git

diff --git a/LogicUI/src/era/mi/gui/LogicUICanvas.java b/LogicUI/src/era/mi/gui/LogicUICanvas.java
index da338013..7faefe39 100644
--- 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 ->
 		{