projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved rendering of GUIMerger and GUISplitter
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
model
/
components
/
atomic
/
GUIMerger.java
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
3ea238d
..
b2a5453
100644
(file)
--- 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;
package net.mograsim.logic.model.model.components.atomic;
+import org.eclipse.swt.SWT;
+
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;
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"));
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.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));
ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);
if (c != null)
gc.setForeground(ColorManager.current().toColor(c));