Avoid wrapping inputs and outputs when computing widths

Author: tkrodriguez

visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Figure.java

@@ -152,6 +152,17 @@ public static int getSlotsWidth(Collection<? extends Slot> slots) {
         return result;
     }
 
+    public int getSlotsWidthBefore(InputSlot inputSlot) {
+        int result = Figure.SLOT_OFFSET;
+        for (Slot s : inputSlots) {
+            if (s == inputSlot) {
+                return result;
+            }
+            result += s.getWidth() + Figure.SLOT_OFFSET;
+        }
+        return result;
+    }
+
     public static int getSlotsWidth(Slot s) {
         if (s == null) {
             return Figure.SLOT_OFFSET;
@@ -405,6 +416,10 @@ public List<InputSlot> getInputSlots() {
         return Collections.unmodifiableList(inputSlots);
     }
 
+    int getInputSlotsWidth() {
+        return Figure.getSlotsWidth(inputSlots);
+    }
+
     public Set<Slot> getSlots() {
         Set<Slot> result = new HashSet<>();
         result.addAll(getInputSlots());
@@ -422,6 +437,17 @@ public List<OutputSlot> getOutputSlots() {
         }
     }
 
+
+    public int getOutputSlotsWidth() {
+        if (outputSlots != null) {
+            return Figure.getSlotsWidth(outputSlots);
+        } else if (singleOutput != null) {
+            return Figure.getSlotsWidth(Collections.singletonList(singleOutput));
+        } else {
+            return 0;
+        }
+    }
+
     void removeInputSlot(InputSlot s, HashSet<Object> cleaned) {
         s.removeAllConnections(cleaned);
         inputSlots.remove(s);

visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/InputSlot.java

@@ -43,13 +43,13 @@ protected Slot copyInto(Figure f) {
 
     @Override
     public Point getRelativePosition() {
-        int gap = getFigure().getWidth() - Figure.getSlotsWidth(getFigure().getInputSlots());
+        int gap = getFigure().getWidth() - getFigure().getInputSlotsWidth();
         if (gap < 0) {
             gap = 0;
         }
         double gapRatio = (double) gap / (double) (getFigure().getInputSlots().size() + 1);
         int gapAmount = (int) ((getPosition() + 1) * gapRatio);
-        return new Point(gapAmount + Figure.getSlotsWidth(Figure.getAllBefore(getFigure().getInputSlots(), this)) + getWidth() / 2, -Figure.SLOT_START);
+        return new Point(gapAmount + getFigure().getSlotsWidthBefore(this) + getWidth() / 2, -Figure.SLOT_START);
     }
 
     @Override

visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/OutputSlot.java

@@ -42,7 +42,7 @@ protected Slot copyInto(Figure f) {
 
     @Override
     public Point getRelativePosition() {
-        int gap = getFigure().getWidth() - Figure.getSlotsWidth(getFigure().getOutputSlots());
+        int gap = getFigure().getWidth() - getFigure().getOutputSlotsWidth();
         if (gap < 0) {
             gap = 0;
         }