[ui] allow specifying percentage of remaining space a given SpacerCom…

…ponent should expand into
wisp-forest · Jan 15, 2024 · 4fd6ff5 · 4fd6ff5
1 parent eaf33c2
commit 4fd6ff5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/owo-ui.xsd b/owo-ui.xsd
@@ -481,6 +481,7 @@
         <xs:complexContent>
             <xs:extension base="componentType">
                 <xs:group ref="componentProps"/>
+                <xs:attribute name="percent" type="xs:unsignedInt"/>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>

diff --git a/src/main/java/io/wispforest/owo/ui/component/Components.java b/src/main/java/io/wispforest/owo/ui/component/Components.java
@@ -146,8 +146,12 @@ public static SmallCheckboxComponent smallCheckbox(Text label) {
         return new SmallCheckboxComponent(label);
     }
 
+    public static SpacerComponent spacer(int percent) {
+        return new SpacerComponent(percent);
+    }
+
     public static SpacerComponent spacer() {
-        return new SpacerComponent();
+        return spacer(100);
     }
 
     // -------

diff --git a/src/main/java/io/wispforest/owo/ui/component/SpacerComponent.java b/src/main/java/io/wispforest/owo/ui/component/SpacerComponent.java
@@ -3,13 +3,20 @@
 import io.wispforest.owo.ui.base.BaseComponent;
 import io.wispforest.owo.ui.core.OwoUIDrawContext;
 import io.wispforest.owo.ui.core.Sizing;
+import io.wispforest.owo.ui.parsing.UIParsing;
+import org.w3c.dom.Element;
 
 public class SpacerComponent extends BaseComponent {
 
-    protected SpacerComponent() {
-        this.sizing(Sizing.expand());
+    protected SpacerComponent(int percent) {
+        this.sizing(Sizing.expand(percent));
     }
 
     @Override
     public void draw(OwoUIDrawContext context, int mouseX, int mouseY, float partialTicks, float delta) {}
+
+    public static SpacerComponent parse(Element element) {
+        if (!element.hasAttribute("percent")) return Components.spacer();
+        return Components.spacer(UIParsing.parseUnsignedInt(element.getAttributeNode("percent")));
+    }
 }
diff --git a/src/main/java/io/wispforest/owo/ui/parsing/UIParsing.java b/src/main/java/io/wispforest/owo/ui/parsing/UIParsing.java
@@ -321,7 +321,7 @@ protected static int parseInt(Node node, boolean allowNegative) {
         registerFactory("color-picker", element -> new ColorPickerComponent());
         registerFactory("slim-slider", SlimSliderComponent::parse);
         registerFactory("small-checkbox", element -> new SmallCheckboxComponent());
-        registerFactory("spacer", element -> Components.spacer());
+        registerFactory("spacer", SpacerComponent::parse);
     }
 
 }