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 0f8b542..542b7f0 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\r
 {\r
        private final String text;\r
+       private Point textExtent;\r
 \r
        public TextComponent(ViewModelModifiable model, String text)\r
        {\r
@@ -23,15 +24,23 @@ public class TextComponent extends GUIComponent
        @Override\r
        public void render(GeneralGC gc, Rectangle visibleRegion)\r
        {\r
-               Point textExtent = gc.textExtent(text);\r
+               textExtent = gc.textExtent(text);\r
                Color textColor = Preferences.current().getColor("net.mograsim.logic.ui.color.text");\r
                if (textColor != null)\r
                        gc.setForeground(textColor);\r
-               gc.drawText(text, getPosX() - textExtent.x / 2, getPosY() - textExtent.y / 2, true);\r
+               gc.drawText(text, getPosX(), getPosY(), true);\r
+       }\r
+\r
+       @Override\r
+       public Rectangle getBounds()\r
+       {\r
+               if (textExtent == null)\r
+                       return super.getBounds();\r
+               return new Rectangle(getPosX(), getPosY(), textExtent.x, textExtent.y);\r
        }\r
 \r
        static\r
        {\r
-               ViewLogicModelAdapter.addComponentAdapter(NoLogicAdapter.forClass(TextComponent.class));\r
+               ViewLogicModelAdapter.addComponentAdapter(new NoLogicAdapter<>(TextComponent.class));\r
        }\r
 }\r