X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2FLogicUICanvas.java;h=fb734056429cbdc2b318dcd1bb08b9bb521861da;hb=be9f99f86e808ab78200c3aa4330d8cac4e999d1;hp=7f187251c8047424657dc032d187f7ab526c0e6f;hpb=e409fc642b81a7e1a50b13067882e3f40cb903cc;p=Mograsim.git diff --git a/LogicUI/src/era/mi/gui/LogicUICanvas.java b/LogicUI/src/era/mi/gui/LogicUICanvas.java index 7f187251..fb734056 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 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,11 +59,13 @@ public class LogicUICanvas extends ZoomableCanvas c.removePinRemovedListener(pinRemovedListener); redrawThreadsafe(); }); - model.addWireAddedListener(w -> + Consumer wireAddedListener = w -> { w.addWireLookChangedListener(redrawConsumer); redrawThreadsafe(); - }); + }; + model.addWireAddedListener(wireAddedListener); + model.getWires().forEach(wireAddedListener); model.addWireRemovedListener(w -> { w.removeWireLookChangedListener(redrawConsumer); @@ -79,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();