move keepScrollBarInArea field from ListWidget to AbstractScrollWidget

Author: brachy84

src/main/java/com/cleanroommc/modularui/widget/AbstractScrollWidget.java

@@ -26,6 +26,7 @@
 public abstract class AbstractScrollWidget<I extends IWidget, W extends AbstractScrollWidget<I, W>> extends AbstractParentWidget<I, W> implements IViewport, Interactable {
 
     private final ScrollArea scroll = new ScrollArea();
+    private boolean keepScrollBarInArea = false;
 
     public AbstractScrollWidget(@Nullable HorizontalScrollData x, @Nullable VerticalScrollData y) {
         super();
@@ -69,9 +70,15 @@ public void getWidgetsAt(IViewportStack stack, HoveredWidgetList widgets, int x,
     public void onResized() {
         if (this.scroll.getScrollX() != null) {
             this.scroll.getScrollX().clamp(this.scroll);
+            if (!this.keepScrollBarInArea) {
+                getArea().width += this.scroll.getScrollY().getThickness();
+            }
         }
         if (this.scroll.getScrollY() != null) {
             this.scroll.getScrollY().clamp(this.scroll);
+            if (!this.keepScrollBarInArea) {
+                getArea().height += this.scroll.getScrollX().getThickness();
+            }
         }
     }
 
@@ -128,4 +135,21 @@ public int getScrollX() {
     public int getScrollY() {
         return this.scroll.getScrollY() != null ? this.scroll.getScrollY().getScroll() : 0;
     }
+
+    /**
+     * Sets whether the scroll bar should be kept inside the area of this widget, which might cause it to overlap with the content of this widget.
+     * By setting the value to false, the size of this widget is expanded by the thickness of the scrollbars after the tree is resized.
+     * Default: false
+     *
+     * @param value if the scroll bar should be kept inside the widgets area
+     * @return this
+     */
+    public W keepScrollBarInArea(boolean value) {
+        this.keepScrollBarInArea = value;
+        return getThis();
+    }
+
+    public W keepScrollBarInArea() {
+        return keepScrollBarInArea(true);
+    }
 }

src/main/java/com/cleanroommc/modularui/widgets/ListWidget.java

@@ -29,7 +29,6 @@ public class ListWidget<I extends IWidget, W extends ListWidget<I, W>> extends A
     private ScrollData scrollData;
     private IIcon childSeparator;
     private final IntList separatorPositions = new IntArrayList();
-    private boolean keepScrollBarInArea = false;
 
     public ListWidget() {
         super(null, null);
@@ -42,16 +41,6 @@ public void onInit() {
         }
     }
 
-    @Override
-    public void onResized() {
-        if (this.keepScrollBarInArea) return;
-        if (this.scrollData.isVertical()) {
-            getArea().width += this.scrollData.getThickness();
-        } else {
-            getArea().height += this.scrollData.getThickness();
-        }
-    }
-
     @Override
     public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
         if (this.childSeparator == null || this.separatorPositions.isEmpty()) return;
@@ -141,11 +130,6 @@ public W scrollDirection(ScrollData data) {
         return getThis();
     }
 
-    public W keepScrollBarInArea() {
-        this.keepScrollBarInArea = true;
-        return getThis();
-    }
-
     public W childSeparator(IIcon separator) {
         this.childSeparator = separator;
         return getThis();