Merge branch 'development' of

[Mograsim.git] / LogicUI / src / era / mi / gui / model / wires / WireCrossPoint.java

diff --git a/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java b/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java
index 73d98f5..04c5f1e 100644 (file)
--- a/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java
+++ b/LogicUI/src/era/mi/gui/model/wires/WireCrossPoint.java
@@ -10,6 +10,8 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 
 public class WireCrossPoint extends GUIComponent
 {
+       private final Pin pin;
+
        private ReadEnd end;
        private final int logicWidth;
 
@@ -18,13 +20,15 @@ public class WireCrossPoint extends GUIComponent
                super(model);
                this.logicWidth = logicWidth;
                setSize(0, 0);
-               addPin(new Pin(this, logicWidth, 0, 0));
+               addPin(this.pin = new Pin(this, logicWidth, 0, 0));
        }
 
        @Override
        public void render(GeneralGC gc, Rectangle visibleRegion)
        {
-               ColorHelper.executeWithDifferentBackground(gc, BitVectorFormatter.formatAsColor(end), () -> gc.fillOval(-1, -1, 2, 2));
+               Rectangle bounds = getBounds();
+               ColorHelper.executeWithDifferentBackground(gc, BitVectorFormatter.formatAsColor(end),
+                               () -> gc.fillOval(bounds.x - 1, bounds.y - 1, 2, 2));
        }
 
        public void setLogicModelBinding(ReadEnd end)
@@ -37,4 +41,9 @@ public class WireCrossPoint extends GUIComponent
        {
                return logicWidth;
        }
+
+       public Pin getPin()
+       {
+               return pin;
+       }
 }
\ No newline at end of file