Improved rendering:

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / model / components / GUIComponent.java

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
index 9cea86a..ca21622 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
@@ -17,10 +17,12 @@ public abstract class GUIComponent
        private final List<Pin> pins;
        protected final List<Pin> pinsUnmodifiable;
 
-       private final List<Consumer<? super GUIComponent>> componentLookChangedListeners;
        private final List<Consumer<? super GUIComponent>> componentMovedListeners;
        private final List<Consumer<? super Pin>> pinAddedListeners;
        private final List<Consumer<? super Pin>> pinRemovedListeners;
+       private final List<Runnable> redrawListeners;
+
+       private final Runnable redrawListenerForSubcomponents;
 
        public GUIComponent(ViewModel model)
        {
@@ -29,10 +31,12 @@ public abstract class GUIComponent
                this.pins = new ArrayList<>();
                this.pinsUnmodifiable = Collections.unmodifiableList(pins);
 
-               this.componentLookChangedListeners = new ArrayList<>();
                this.componentMovedListeners = new ArrayList<>();
                this.pinAddedListeners = new ArrayList<>();
                this.pinRemovedListeners = new ArrayList<>();
+               this.redrawListeners = new ArrayList<>();
+
+               redrawListenerForSubcomponents = this::callRedrawListeners;
 
                model.componentCreated(this);
        }
@@ -77,43 +81,52 @@ public abstract class GUIComponent
        }
 
        // @formatter:off
-       public void addComponentLookChangedListener   (Consumer<? super GUIComponent> listener) {componentLookChangedListeners.add   (listener);}
-       public void addComponentMovedListener         (Consumer<? super GUIComponent> listener) {componentMovedListeners      .add   (listener);}
-       public void addPinAddedListener               (Consumer<? super Pin         > listener) {pinAddedListeners            .add   (listener);}
-       public void addPinRemovedListener             (Consumer<? super Pin         > listener) {pinRemovedListeners          .add   (listener);}
-                                                  
-       public void removeComponentLookChangedListener(Consumer<? super GUIComponent> listener) {componentLookChangedListeners.remove(listener);}
-       public void removeComponentMovedListener      (Consumer<? super GUIComponent> listener) {componentMovedListeners      .remove(listener);}
-       public void removePinAddedListener            (Consumer<? super Pin         > listener) {pinAddedListeners            .remove(listener);}
-       public void removePinRemovedListener          (Consumer<? super Pin         > listener) {pinRemovedListeners          .remove(listener);}
-
-       protected void callComponentLookChangedListeners(     ) {componentLookChangedListeners.forEach(l -> l.accept(this));}
-       private   void callComponentMovedListeners      (     ) {componentMovedListeners      .forEach(l -> l.accept(this));}
-       private   void callPinAddedListeners            (Pin p) {pinAddedListeners            .forEach(l -> l.accept(p   ));}
-       private   void callPinRemovedListeners          (Pin p) {pinRemovedListeners          .forEach(l -> l.accept(p   ));}
-       // @form  atter:on
+       public void addComponentMovedListener   (Consumer<? super GUIComponent> listener) {componentMovedListeners.add   (listener);}
+       public void addPinAddedListener         (Consumer<? super Pin         > listener) {pinAddedListeners      .add   (listener);}
+       public void addPinRemovedListener       (Consumer<? super Pin         > listener) {pinRemovedListeners    .add   (listener);}
+       public void addRedrawListener           (Runnable                       listener) {redrawListeners        .add   (listener);}
+
+       public void removeComponentMovedListener(Consumer<? super GUIComponent> listener) {componentMovedListeners .remove(listener);}
+       public void removePinAddedListener      (Consumer<? super Pin         > listener) {pinAddedListeners       .remove(listener);}
+       public void removePinRemovedListener    (Consumer<? super Pin         > listener) {pinRemovedListeners     .remove(listener);}
+       public void removeRedrawListener        (Runnable                       listener) {redrawListeners         .remove(listener);}
+
+       private void callComponentMovedListeners(     ) {componentMovedListeners.forEach(l -> l.accept(this));}
+       private void callPinAddedListeners      (Pin p) {pinAddedListeners      .forEach(l -> l.accept(p   ));}
+       private void callPinRemovedListeners    (Pin p) {pinRemovedListeners    .forEach(l -> l.accept(p   ));}
+       private void callRedrawListeners        (     ) {redrawListeners        .forEach(l -> l.run(       ));}
+       // @formatter:on
 
        /**
         * Render this component to the given gc.
         */
        public abstract void render(GeneralGC gc, Rectangle visibleRegion);
 
+       protected void requestRedraw()
+       {
+               callRedrawListeners();
+       }
+
        protected void setSize(double width, double height)
        {
                bounds.width = width;
                bounds.height = height;
-               callComponentLookChangedListeners();
+               callRedrawListeners();
        }
 
        protected void addPin(Pin pin)
        {
                pins.add(pin);
                callPinAddedListeners(pin);
+               pin.addRedrawListener(redrawListenerForSubcomponents);
+               callRedrawListeners();
        }
 
        protected void removePin(Pin pin)
        {
                pins.remove(pin);
                callPinRemovedListeners(pin);
+               pin.removeRedrawListener(redrawListenerForSubcomponents);
+               callRedrawListeners();
        }
 }
\ No newline at end of file