Fixed TextComponent having two different positions:

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

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/TextComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/TextComponent.java
index 871d4f9..e5a6347 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/TextComponent.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/TextComponent.java
@@ -13,6 +13,7 @@ import net.mograsim.preferences.Preferences;
 public class TextComponent extends GUIComponent
 {
        private final String text;
+       private Point textExtent;
 
        public TextComponent(ViewModelModifiable model, String text)
        {
@@ -23,15 +24,23 @@ public class TextComponent extends GUIComponent
        @Override
        public void render(GeneralGC gc, Rectangle visibleRegion)
        {
-               Point textExtent = gc.textExtent(text);
+               textExtent = gc.textExtent(text);
                Color textColor = Preferences.current().getColor("net.mograsim.logic.ui.color.text");
                if (textColor != null)
                        gc.setForeground(textColor);
-               gc.drawText(text, getPosX() - textExtent.x / 2, getPosY() - textExtent.y / 2, true);
+               gc.drawText(text, getPosX(), getPosY(), true);
+       }
+
+       @Override
+       public Rectangle getBounds()
+       {
+               if (textExtent == null)
+                       return super.getBounds();
+               return new Rectangle(getPosX(), getPosY(), textExtent.x, textExtent.y);
        }
 
        static
        {
-               ViewLogicModelAdapter.addComponentAdapter(NoLogicAdapter.forClass(TextComponent.class));
+               ViewLogicModelAdapter.addComponentAdapter(new NoLogicAdapter<>(TextComponent.class));
        }
 }