From 72d2d3f545040354e99f6761321c0f0365bc5bf1 Mon Sep 17 00:00:00 2001
From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Wed, 29 May 2019 17:13:46 +0200
Subject: [PATCH] Fixed redrawing bug

---
 LogicUI/src/era/mi/gui/LogicUICanvas.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/LogicUI/src/era/mi/gui/LogicUICanvas.java b/LogicUI/src/era/mi/gui/LogicUICanvas.java
index 18d424d7..c516e0c6 100644
--- a/LogicUI/src/era/mi/gui/LogicUICanvas.java
+++ b/LogicUI/src/era/mi/gui/LogicUICanvas.java
@@ -8,6 +8,7 @@ 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;
@@ -40,14 +41,16 @@ public class LogicUICanvas extends ZoomableCanvas
 			p.removePinMovedListener(redrawConsumer);
 			redrawThreadsafe();
 		};
-		model.addComponentAddedListener(c ->
+		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);
@@ -56,17 +59,18 @@ public class LogicUICanvas extends ZoomableCanvas
 			c.removePinRemovedListener(pinRemovedListener);
 			redrawThreadsafe();
 		});
-		model.addWireAddedListener(w ->
+		Consumer<? super GUIWire> wireAddedListener = w ->
 		{
 			w.addWireLookChangedListener(redrawConsumer);
 			redrawThreadsafe();
-		});
+		};
+		model.addWireAddedListener(wireAddedListener);
+		model.getWires().forEach(wireAddedListener);
 		model.addWireRemovedListener(w ->
 		{
 			w.removeWireLookChangedListener(redrawConsumer);
 			redrawThreadsafe();
 		});
-		// TODO add listeners for existing components & wires
 
 		addZoomedRenderer(gc ->
 		{
-- 
2.17.1