From 2e78699c41f9309fe6674341bc8cc944254d68c5 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Thu, 25 Jul 2019 11:08:37 +0200
Subject: [PATCH] minor layout improvements

---
 .../digital/gui/components/table/ExpressionComponent.java    | 5 +++--
 .../digital/gui/components/table/ExpressionListenerJK.java   | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/neemann/digital/gui/components/table/ExpressionComponent.java b/src/main/java/de/neemann/digital/gui/components/table/ExpressionComponent.java
index 5cd81db8e..189b0c89d 100644
--- a/src/main/java/de/neemann/digital/gui/components/table/ExpressionComponent.java
+++ b/src/main/java/de/neemann/digital/gui/components/table/ExpressionComponent.java
@@ -18,6 +18,7 @@ import static de.neemann.digital.draw.graphics.text.formatter.GraphicsFormatter.
  * Component to show an expression
  */
 public class ExpressionComponent extends JComponent {
+    private static final int XPAD = 5;
     private ArrayList<Expression> expressions;
     private Dimension lastRectSet;
 
@@ -63,7 +64,7 @@ public class ExpressionComponent extends JComponent {
             try {
                 GraphicsFormatter.Fragment fr = createFragment(gr, e);
                 y += fr.getHeight();
-                fr.draw(gr, 5, y);
+                fr.draw(gr, XPAD, y);
                 y += lineSpacing;
 
                 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)) {
             lastRectSet = p;
             SwingUtilities.invokeLater(() -> {
diff --git a/src/main/java/de/neemann/digital/gui/components/table/ExpressionListenerJK.java b/src/main/java/de/neemann/digital/gui/components/table/ExpressionListenerJK.java
index 04784ffdf..7ac707ed6 100644
--- a/src/main/java/de/neemann/digital/gui/components/table/ExpressionListenerJK.java
+++ b/src/main/java/de/neemann/digital/gui/components/table/ExpressionListenerJK.java
@@ -35,6 +35,8 @@ public class ExpressionListenerJK implements ExpressionListener {
             String detName = name.substring(0, name.length() - 2);
             DetermineJKStateMachine jk = new DetermineJKStateMachine(detName, expression);
             if (detName.endsWith("^n"))
+                detName = detName.substring(0, detName.length() - 2);
+            else
                 detName = detName.substring(0, detName.length() - 1);
             Expression j = jk.getJ();
             parent.resultFound("J_" + detName, j);