X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUIManualSwitch.java;h=be4c3272fa35ba31e48c271ef55eaf325a128420;hb=bd0bb6405394b9a6dcba9c072f510c7d69710424;hp=0993024d518e3ba305a6e8c27fc76fe9d28bb065;hpb=213446f32132c309c396d0d8c66b6977efb81df1;p=Mograsim.git

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 0993024d..be4c3272 100644
--- 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
@@ -1,5 +1,7 @@
 package net.mograsim.logic.ui.model.components;
 
+import org.eclipse.swt.graphics.Color;
+
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
@@ -11,6 +13,9 @@ import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;
+import net.mograsim.logic.ui.modeladapter.componentadapters.ManualSwitchAdapter;
+import net.mograsim.preferences.Preferences;
 
 public class GUIManualSwitch extends GUIComponent
 {
@@ -30,23 +35,26 @@ public class GUIManualSwitch extends GUIComponent
 		logicObs = (i) -> requestRedraw();
 
 		setSize(width, height);
-		addPin(this.outputPin = new Pin(this, 1, width, height / 2));
+		addPin(this.outputPin = new Pin(this, "", 1, width, height / 2));
 	}
 
 	@Override
 	public void render(GeneralGC gc, Rectangle visibleRegion)
 	{
-		double posX = getBounds().x;
-		double posY = getBounds().y;
-
 		// TODO maybe draw switch state too?
-		gc.drawRectangle(posX, posY, width, height);
+		Color foreground = Preferences.current().getColor("net.mograsim.logic.ui.color.foreground");
+		if (foreground != null)
+			gc.setForeground(foreground);
+		gc.drawRectangle(getBounds());
 		String label = BitVectorFormatter.formatValueAsString(end);
 		Font oldFont = gc.getFont();
 		Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle());
 		gc.setFont(labelFont);
 		Point textExtent = gc.textExtent(label);
-		gc.drawText(label, posX + (width - textExtent.x) / 2, posY + (height - textExtent.y) / 2, true);
+		Color textColor = Preferences.current().getColor("net.mograsim.logic.ui.color.text");
+		if (textColor != null)
+			gc.setForeground(textColor);
+		gc.drawText(label, getPosX() + (width - textExtent.x) / 2, getPosY() + (height - textExtent.y) / 2, true);
 		gc.setFont(oldFont);
 	}
 
@@ -80,8 +88,18 @@ public class GUIManualSwitch extends GUIComponent
 		return true;
 	}
 
+	public ManualSwitch getManualSwitch()
+	{
+		return logicSwitch;
+	}
+
 	public Pin getOutputPin()
 	{
 		return outputPin;
 	}
+
+	static
+	{
+		ViewLogicModelAdapter.addComponentAdapter(new ManualSwitchAdapter());
+	}
 }
\ No newline at end of file