fix scrollbar overlapping with content & fix cross axis padding

Author: brachy84

src/main/java/com/cleanroommc/modularui/test/TestGuis.java

@@ -93,6 +93,10 @@ public TestGuis() {
         super(ModularUI.ID);
     }
 
+    /**
+     * This method finds all 'build___UI' methods in this class via reflection and adds a button that opens that UI to a list widget.
+     * This makes it very convenient to add and test test-screens without having to swap out the screen that the diamond item opens.
+     */
     @Override
     public @NotNull ModularPanel buildUI(ModularGuiContext context) {
         // collect all test from all build methods in this class via reflection
@@ -124,6 +128,7 @@ public TestGuis() {
                                                 try {
                                                     ModularPanel panel = (ModularPanel) m.invoke(null);
                                                     if (TestGuis.withCode) {
+                                                        // WIP: this is meant to put an image of the code next to ui for showcase purpose
                                                         panel.child(UITexture.builder()
                                                                 .location("gui/code/" + codeTextureName)
                                                                 .build()

src/main/java/com/cleanroommc/modularui/widget/sizer/Unit.java

@@ -27,12 +27,6 @@ public String getText(GuiAxis axis) {
         }
     }
 
-    public static final byte UNUSED = -2;
-    public static final byte DEFAULT = -1;
-    public static final byte START = 0;
-    public static final byte END = 1;
-    public static final byte SIZE = 2;
-
     private boolean autoAnchor = true;
     private float value = 0f;
     private DoubleSupplier valueSupplier = null;

src/main/java/com/cleanroommc/modularui/widgets/layout/Flow.java

@@ -1,5 +1,6 @@
 package com.cleanroommc.modularui.widgets.layout;
 
+import com.cleanroommc.modularui.ModularUI;
 import com.cleanroommc.modularui.api.GuiAxis;
 import com.cleanroommc.modularui.api.layout.ILayoutWidget;
 import com.cleanroommc.modularui.api.widget.IWidget;
@@ -210,34 +211,41 @@ public boolean postLayoutWidgets() {
     public static boolean layoutCrossAxisListLike(IWidget parent, GuiAxis axis, Alignment.CrossAxis caa, boolean reverseLayout) {
         if (!parent.hasChildren()) return true;
         GuiAxis other = axis.getOther();
-        int width = parent.getArea().getSize(other);
+        int availableSize = parent.getArea().getSize(other);
         Box padding = parent.getArea().getPadding();
-        boolean hasWidth = parent.resizer().isSizeCalculated(other);
-        if (!hasWidth && caa != Alignment.CrossAxis.START) return false;
+        boolean hasSize = parent.resizer().isSizeCalculated(other);
+        if (!hasSize && caa != Alignment.CrossAxis.START) return false;
         List<IWidget> childrenList = reverseLayout ? new ReversedList<>(parent.getChildren()) : parent.getChildren();
         for (IWidget widget : childrenList) {
             // exclude children whose position of main axis is fixed
             if (widget.resizer().hasPos(axis)) continue;
             Box margin = widget.getArea().getMargin();
             // don't align auto positioned children in cross axis
             if (!widget.resizer().hasPos(other) && widget.resizer().isSizeCalculated(other)) {
-                int crossAxisPos = margin.getStart(other) + padding.getStart(other);
-                if (hasWidth) {
-                    if (caa == Alignment.CrossAxis.CENTER) {
-                        crossAxisPos = (int) (width / 2f - widget.getArea().getSize(other) / 2f);
-                    } else if (caa == Alignment.CrossAxis.END) {
-                        crossAxisPos = width - widget.getArea().getSize(other) - margin.getEnd(other) - padding.getStart(other);
+                int start = margin.getStart(other) + padding.getStart(other);
+                int crossAxisPos = 0;
+                if (caa == Alignment.CrossAxis.START) {
+                    crossAxisPos = start;
+                } else {
+                    int end = margin.getEnd(other) + padding.getEnd(other);
+                    int s = widget.getArea().getSize(other);
+                    if (caa == Alignment.CrossAxis.END) {
+                        crossAxisPos = availableSize - s - end;
+                    } else if (caa == Alignment.CrossAxis.CENTER) {
+                        crossAxisPos = (int) (availableSize / 2f - widget.getArea().getSize(other) / 2f);
+                        if (availableSize < s + start + end) {
+                            ModularUI.LOGGER.warn("Widget {} is larger with padding on axis {} than parent {}. Padding can't be applied correctly!", widget, other, parent);
+                        } else {
+                            if (crossAxisPos < start) crossAxisPos = start;
+                            else if (crossAxisPos > availableSize - end - s) crossAxisPos = availableSize - end - s;
+                        }
                     }
                 }
                 widget.getArea().setRelativePoint(other, crossAxisPos);
                 widget.getArea().setPoint(other, parent.getArea().getPoint(other) + crossAxisPos);
                 widget.resizer().setPosResized(other, true);
                 widget.resizer().setMarginPaddingApplied(other, true);
             }
-            /*if (parent.isValid()) {
-                // we changed rel pos, but we need to calculate the new absolute pos and other stuff
-                widget.resizer().applyPos();
-            }*/
         }
         return true;
     }