From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Mon, 19 Aug 2019 08:35:11 +0000 (+0200)
Subject: Improved rendering of GUIMerger and GUISplitter
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=dfcc6a830f210d7b33945113959dacdc74a80aee;p=Mograsim.git

Improved rendering of GUIMerger and GUISplitter
---

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
index a287dd86..ad1d51e0 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
@@ -1,5 +1,7 @@
 package net.mograsim.logic.model.model.components.atomic;
 
+import org.eclipse.swt.SWT;
+
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 
@@ -55,7 +57,12 @@ public class GUIMerger extends GUIComponent
 			gc.drawLine(posX, inputHeight, posX + width / 2, inputHeight);
 		}
 		gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));
+		int oldLineCap = gc.getLineCap();
+		int lineJoin = gc.getLineJoin();
+		// TODO find better "replacement" for JOIN_BEVEL
+		gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE);
 		gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));
+		gc.setLineCap(oldLineCap);
 		ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);
 		if (c != null)
 			gc.setForeground(ColorManager.current().toColor(c));
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
index 1ffe79d1..08ce9518 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
@@ -1,5 +1,7 @@
 package net.mograsim.logic.model.model.components.atomic;
 
+import org.eclipse.swt.SWT;
+
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 
@@ -52,7 +54,12 @@ public class GUISplitter extends GUIComponent
 		double inLineY = posY + (logicWidth - 1) * heightPerPin / 2;
 		gc.drawLine(posX, inLineY, posX + width / 2, inLineY);
 		gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));
+		int oldLineCap = gc.getLineCap();
+		int lineJoin = gc.getLineJoin();
+		// TODO find better "replacement" for JOIN_BEVEL
+		gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE);
 		gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));
+		gc.setLineCap(oldLineCap);
 		double outputHeight = posY;
 		for (int i = 0; i < logicWidth; i++, outputHeight += 10)
 		{