aspectRatio for Icon

Author: brachy84

src/main/java/com/cleanroommc/modularui/drawable/Icon.java

@@ -21,6 +21,7 @@ public class Icon implements IIcon, IJsonSerializable {
 
     private final IDrawable drawable;
     private int width = 0, height = 0;
+    private float aspectRatio = 0;
     private Alignment alignment = Alignment.Center;
     private final Box margin = new Box();
 
@@ -55,13 +56,37 @@ public void draw(GuiContext context, int x, int y, int width, int height, Widget
         y += this.margin.getTop();
         width -= this.margin.horizontal();
         height -= this.margin.vertical();
-        if (this.width > 0) {
-            x += (int) (width * this.alignment.x - this.width * this.alignment.x);
-            width = this.width;
+        int frameWidth = width;
+        int frameHeight = height;
+        if (this.width > 0) width = this.width;
+        if (this.height > 0) height = this.height;
+        if (this.aspectRatio > 0) {
+            if (this.width <= 0) {
+                if (this.height <= 0) {
+                    // width and height is unset, so adjust width or height so that one of them takes the full space
+                    float w = width, h = height;
+                    float properW = this.aspectRatio * h;
+                    if (w > properW) {
+                        width = (int) properW;
+                    } else if (w < properW) {
+                        height = (int) (w / this.aspectRatio);
+                    }
+                } else {
+                    // height is set, so adjust width to height
+                    float properW = this.aspectRatio * height;
+                    width = (int) properW;
+                }
+            } else if (this.height <= 0) {
+                // width is set, so adjust height to width
+                height = (int) (width / this.aspectRatio);
+            }
         }
-        if (this.height > 0) {
-            y += (int) (height * this.alignment.y - this.height * this.alignment.y);
-            height = this.height;
+        // apply alignment
+        if (width != frameWidth) {
+            x += (int) (frameWidth * this.alignment.x - width * this.alignment.x);
+        }
+        if (height != frameHeight) {
+            y += (int) (frameHeight * this.alignment.y - height * this.alignment.y);
         }
         this.drawable.draw(context, x, y, width, height, widgetTheme);
     }
@@ -96,6 +121,11 @@ public Icon size(int size) {
         return width(size).height(size);
     }
 
+    public Icon aspectRatio(float aspectRatio) {
+        this.aspectRatio = aspectRatio;
+        return this;
+    }
+
     public Icon alignment(Alignment alignment) {
         this.alignment = alignment;
         return this;
@@ -148,6 +178,7 @@ public void loadFromJson(JsonObject json) {
         this.height = (json.has("autoHeight") || json.has("autoSize")) &&
                 JsonHelper.getBoolean(json, true, "autoHeight", "autoSize") ? 0 :
                 JsonHelper.getInt(json, 0, "height", "h", "size");
+        this.aspectRatio = JsonHelper.getFloat(json, 0, "aspectRatio");
         this.alignment = JsonHelper.deserialize(json, Alignment.class, Alignment.Center, "alignment", "align");
         this.margin.fromJson(json);
     }
@@ -161,6 +192,7 @@ public boolean saveToJson(JsonObject json) {
         json.add("drawable", JsonHelper.serialize(this.drawable));
         json.addProperty("width", this.width);
         json.addProperty("height", this.height);
+        json.addProperty("aspectRatio", this.aspectRatio);
         json.add("alignment", JsonHelper.serialize(this.alignment));
         this.margin.toJson(json);
         return true;

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

@@ -544,9 +544,32 @@ public static ModularPanel buildCollapseDisabledChildrenUI() {
                         .yLim(-1.2f, 1.2f)
                         .xTickFinder(MathUtils.PI_HALF, 1)
                         .yTickFinder(0.2f, 1)
+                        .graphAspectRatio(16 / 9f)
                         .plot(x, y));
     }
 
+    public static @NotNull ModularPanel buildAspectRatioUI() {
+        return new ModularPanel("aspect_ratio")
+                .coverChildren()
+                .padding(10)
+                .child(new Row()
+                        .childPadding(10)
+                        .coverChildren()
+                        .child(new Rectangle().color(Color.BLUE_ACCENT.main)
+                                .asIcon().aspectRatio(4f / 3)
+                                .asWidget().size(80)
+                                .overlay(IKey.str("4:3 Free")))
+                        .child(new Rectangle().color(Color.RED_ACCENT.main)
+                                .asIcon().aspectRatio(4f / 3).width(70)
+                                .asWidget().size(80)
+                                .overlay(IKey.str("4:3 | width = 70")))
+                        .child(new Rectangle().color(Color.LIGHT_GREEN.main)
+                                .asIcon().aspectRatio(4f / 3).height(45).alignment(Alignment.BottomRight)
+                                .asWidget().size(80)
+                                .overlay(IKey.str("4:3 | height = 45\nBottom Right"))))
+                .overlay();
+    }
+
     private static class TestPanel extends ModularPanel {
 
         public TestPanel(String name) {