Cleanups in bounding box rendering

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/Am2901NANDBased.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/Am2901NANDBased.java
index d63b41d..4035795 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/Am2901NANDBased.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/Am2901NANDBased.java
@@ -35,10 +35,10 @@ public class Am2901NANDBased extends GUIComponent
                double posX = getBounds().x;
                double posY = getBounds().y;
 
+               gc.drawRectangle(getBounds());
                Font oldFont = gc.getFont();
                Font labelFont = new Font(oldFont.getName(), 4, oldFont.getStyle());
                gc.setFont(labelFont);
-               gc.drawRectangle(posX, posY, 50, getBounds().height);
                for (int i = 0; i < inputNames.size(); i++)
                {
                        Point textExtent = gc.textExtent(inputNames.get(i));

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java
index fd2f736..ec397c0 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java
@@ -38,7 +38,7 @@ public class GUIBitDisplay extends GUIComponent
                double posY = getBounds().y;
 
                // TODO maybe draw switch state too?
-               gc.drawRectangle(posX, posY, width, height);
+               gc.drawRectangle(getBounds());
                String label = bitDisplay == null ? BitVectorFormatter.formatAsString(null)
                                : BitVectorFormatter.formatAsString(bitDisplay.getDisplayedValue());
                Font oldFont = gc.getFont();

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java
index 0993024..8b9bcd9 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java
@@ -40,7 +40,7 @@ public class GUIManualSwitch extends GUIComponent
                double posY = getBounds().y;
 
                // TODO maybe draw switch state too?
-               gc.drawRectangle(posX, posY, width, height);
+               gc.drawRectangle(getBounds());
                String label = BitVectorFormatter.formatValueAsString(end);
                Font oldFont = gc.getFont();
                Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle());