\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
p.removePinMovedListener(redrawConsumer);\r
redrawThreadsafe();\r
};\r
- model.addComponentAddedListener(c ->\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
+ };\r
+ model.addComponentAddedListener(componentAddedListener);\r
+ model.getComponents().forEach(componentAddedListener);\r
model.addComponentRemovedListener(c ->\r
{\r
c.removeComponentLookChangedListener(redrawConsumer);\r
c.removePinRemovedListener(pinRemovedListener);\r
redrawThreadsafe();\r
});\r
- model.addWireAddedListener(w ->\r
+ Consumer<? super GUIWire> wireAddedListener = w ->\r
{\r
w.addWireLookChangedListener(redrawConsumer);\r
redrawThreadsafe();\r
- });\r
+ };\r
+ model.addWireAddedListener(wireAddedListener);\r
+ model.getWires().forEach(wireAddedListener);\r
model.addWireRemovedListener(w ->\r
{\r
w.removeWireLookChangedListener(redrawConsumer);\r
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