TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-15 07:48:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor layout improvements

Browse Source
This commit is contained in:
hneemann 2019-07-25 11:08:37 +02:00
parent b6eae0d99c
commit 2e78699c41
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/neemann/digital/gui/components/table/ExpressionComponent.java
View File

@ -18,6 +18,7 @@ import static de.neemann.digital.draw.graphics.text.formatter.GraphicsFormatter.
* Component to show an expression * Component to show an expression
*/ */
public class ExpressionComponent extends JComponent { public class ExpressionComponent extends JComponent {
private static final int XPAD = 5;
private ArrayList<Expression> expressions; private ArrayList<Expression> expressions;
private Dimension lastRectSet; private Dimension lastRectSet;
@ -63,7 +64,7 @@ public class ExpressionComponent extends JComponent {
try { try {
GraphicsFormatter.Fragment fr = createFragment(gr, e); GraphicsFormatter.Fragment fr = createFragment(gr, e);
y += fr.getHeight(); y += fr.getHeight();
fr.draw(gr, 5, y); fr.draw(gr, XPAD, y);
y += lineSpacing; y += lineSpacing;
if (dx < fr.getWidth()) if (dx < fr.getWidth())
@ -73,7 +74,7 @@ public class ExpressionComponent extends JComponent {
} }
} }
Dimension p = new Dimension(dx, y); Dimension p = new Dimension(dx+XPAD*2, y);
if (!p.equals(lastRectSet)) { if (!p.equals(lastRectSet)) {
lastRectSet = p; lastRectSet = p;
SwingUtilities.invokeLater(() -> { SwingUtilities.invokeLater(() -> {

2
src/main/java/de/neemann/digital/gui/components/table/ExpressionListenerJK.java
View File

@ -35,6 +35,8 @@ public class ExpressionListenerJK implements ExpressionListener {
String detName = name.substring(0, name.length() - 2); String detName = name.substring(0, name.length() - 2);
DetermineJKStateMachine jk = new DetermineJKStateMachine(detName, expression); DetermineJKStateMachine jk = new DetermineJKStateMachine(detName, expression);
if (detName.endsWith("^n")) if (detName.endsWith("^n"))
detName = detName.substring(0, detName.length() - 2);
else
detName = detName.substring(0, detName.length() - 1); detName = detName.substring(0, detName.length() - 1);
Expression j = jk.getJ(); Expression j = jk.getJ();
parent.resultFound("J_" + detName, j); parent.resultFound("J_" + detName, j);