From 28a6c40ea8c9d54862636bfc5d43f7882e4ce15e Mon Sep 17 00:00:00 2001
From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Mon, 2 Sep 2019 22:36:45 +0200
Subject: [PATCH] Text no longer jitters

---
 SWTHelper                                            |  2 +-
 .../logic/model/am2900/am2904/Am2904Testbench.java   |  1 -
 .../src/net/mograsim/logic/model/LogicUICanvas.java  |  2 +-
 .../src/net/mograsim/plugin/ThemePreferences.java    |  6 ++++++
 .../net/mograsim/preferences/DefaultPreferences.java | 12 ++++++++++++
 .../src/net/mograsim/preferences/Preferences.java    |  2 ++
 6 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/SWTHelper b/SWTHelper
index cab99990..5d095c6e 160000
--- a/SWTHelper
+++ b/SWTHelper
@@ -1 +1 @@
-Subproject commit cab999904f88b362e7641dc9125efef99d1d432b
+Subproject commit 5d095c6ec38999a30aea50212e0637d41cb25c2b
diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java
index 832d7866..87b67fc3 100644
--- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java
+++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java
@@ -23,7 +23,6 @@ public class Am2904Testbench
 
 	public static void create(ViewModelModifiable model)
 	{
-		// TODO use _SE in GUIAm2904.json
 		// TODO replace with proper ViewModel deserialization
 		DeserializedSubmodelComponent testbench = (DeserializedSubmodelComponent) IndirectGUIComponentCreator.createComponent(model,
 				"file:GUIAm2904Testbench.json", "testbench");
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
index 51778c1d..115605f1 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java
@@ -42,7 +42,7 @@ public class LogicUICanvas extends ZoomableCanvas
 
 	public LogicUICanvas(Composite parent, int style, ViewModel model)
 	{
-		super(parent, style);
+		super(parent, style, Preferences.current().getBoolean("net.mograsim.logic.model.improvetext"));
 
 		this.model = model;
 
diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/ThemePreferences.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/ThemePreferences.java
index 6ea0028e..42da25d1 100644
--- a/net.mograsim.plugin.core/src/net/mograsim/plugin/ThemePreferences.java
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/ThemePreferences.java
@@ -22,6 +22,12 @@ public class ThemePreferences extends Preferences
 		this.theme = theme;
 	}
 
+	@Override
+	public boolean getBoolean(String name)
+	{
+		return new DefaultPreferences().getBoolean(name);
+	}
+
 	@Override
 	public int getInt(String name)
 	{
diff --git a/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java b/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java
index 8083680e..d2c23429 100644
--- a/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java
+++ b/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java
@@ -4,6 +4,18 @@ import net.mograsim.preferences.ColorDefinition.BuiltInColor;
 
 public class DefaultPreferences extends Preferences
 {
+	@Override
+	public boolean getBoolean(String name)
+	{
+		switch (name)
+		{
+		case "net.mograsim.logic.model.improvetext":
+			return true;
+		default:
+			throw new IllegalArgumentException("Unknown boolean preference name: " + name);
+		}
+	}
+
 	@Override
 	public int getInt(String name)
 	{
diff --git a/net.mograsim.preferences/src/net/mograsim/preferences/Preferences.java b/net.mograsim.preferences/src/net/mograsim/preferences/Preferences.java
index dba296e3..f2498564 100644
--- a/net.mograsim.preferences/src/net/mograsim/preferences/Preferences.java
+++ b/net.mograsim.preferences/src/net/mograsim/preferences/Preferences.java
@@ -20,6 +20,8 @@ public abstract class Preferences
 		return currentPreferences;
 	}
 
+	public abstract boolean getBoolean(String name);
+
 	public abstract int getInt(String name);
 
 	public abstract double getDouble(String name);
-- 
2.17.1