X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FTextComponent.java;h=f2507022f867e766d79b4de9a06e201c45aa4212;hb=0a04a4ed66ecebd4254541c4977599f6052c115a;hp=87c3cf47ab8a581512896663e21f2e499e64313c;hpb=a393b0a2a9899707af54c9ee77a01f28ac967bd1;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/TextComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/TextComponent.java
index 87c3cf47..f2507022 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/TextComponent.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/TextComponent.java
@@ -2,9 +2,6 @@ package net.mograsim.logic.model.model.components.atomic;
 
 import org.eclipse.swt.graphics.Color;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
@@ -12,6 +9,7 @@ import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
 import net.mograsim.logic.model.modeladapter.componentadapters.NoLogicAdapter;
+import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.preferences.Preferences;
 
@@ -19,6 +17,7 @@ import net.mograsim.preferences.Preferences;
 public class TextComponent extends GUIComponent
 {
 	private final String text;
+	private boolean calculatedSize;
 
 	public TextComponent(ViewModelModifiable model, String text)
 	{
@@ -37,10 +36,14 @@ public class TextComponent extends GUIComponent
 	@Override
 	public void render(GeneralGC gc, Rectangle visibleRegion)
 	{
-		Point textExtent = gc.textExtent(text);
-		setSize(textExtent.x, textExtent.y);
+		if (!calculatedSize)
+		{
+			calculatedSize = true;
+			Point textExtent = gc.textExtent(text);
+			setSize(textExtent.x, textExtent.y);
+		}
 
-		Color textColor = Preferences.current().getColor("net.mograsim.logic.ui.color.text");
+		Color textColor = Preferences.current().getColor("net.mograsim.logic.model.color.text");
 		if (textColor != null)
 			gc.setForeground(textColor);
 		gc.drawText(text, getPosX(), getPosY(), true);
@@ -49,9 +52,15 @@ public class TextComponent extends GUIComponent
 	// serializing
 
 	@Override
-	public JsonElement getParamsForSerializing()
+	public String getIDForSerializing(IdentifyParams idParams)
+	{
+		return "TextComponent";
+	}
+
+	@Override
+	public String getParamsForSerializing(IdentifyParams idParams)
 	{
-		return new JsonPrimitive(text);
+		return text;
 	}
 
 	static