X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FGUIMerger.java;h=b2a5453928cace68021f6cfebd7e41465972ac3b;hb=ee907559f02192495043a97fc401cb4abad77137;hp=3ea238d4fb4ae6c0569e943db0d30116f8e8afc3;hpb=77f1a4885b121ab2cf8a518cf6b10cb88b9ba4c9;p=Mograsim.git 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 3ea238d4..b2a54539 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));