From 52f80281bd5faf9c769f55983ac3fdce1be7adbb Mon Sep 17 00:00:00 2001 From: Klesti Selimaj Date: Sat, 21 Feb 2026 19:46:40 +0100 Subject: [PATCH] Fixed a few issues --- .../java/org/saturnclient/saturnclient/config/Theme.java | 1 - .../org/saturnclient/ui2/components/CosmeticPreview.java | 9 ++++----- src/main/java/org/saturnclient/ui2/elements/Button.java | 1 + .../org/saturnclient/ui2/elements/TextureButton.java | 7 ++++--- .../java/org/saturnclient/ui2/screens/ShiftMenu.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/saturnclient/saturnclient/config/Theme.java b/src/main/java/org/saturnclient/saturnclient/config/Theme.java index 7471507..c10a139 100644 --- a/src/main/java/org/saturnclient/saturnclient/config/Theme.java +++ b/src/main/java/org/saturnclient/saturnclient/config/Theme.java @@ -25,7 +25,6 @@ public class Theme { // UI metrics public static Property BG_RADIUS = Property.integer(12); public static Property WIDGET_RADIUS = Property.integer(10); - public static Property PADDING = Property.integer(14); // Font (keeping your current system) public static Property FONT = Property.font(1); diff --git a/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java b/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java index 6056550..49ace16 100644 --- a/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java +++ b/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java @@ -9,8 +9,7 @@ import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; public class CosmeticPreview extends Element { - static { - } + static int padding = 14; Identifier sprite; private Runnable onClick; @@ -32,10 +31,10 @@ public class CosmeticPreview extends Element { renderScope.setRenderLayer(RenderLayer::getGuiTextured); - int texWidth = width - Theme.PADDING.value; - int texHeight = height - Theme.PADDING.value; + int texWidth = width - padding; + int texHeight = height - padding; - renderScope.drawTexture(sprite, Theme.PADDING.value / 2, Theme.PADDING.value / 2, 0, 0, texWidth, texHeight, + renderScope.drawTexture(sprite, padding / 2, padding / 2, 0, 0, texWidth, texHeight, Theme.FOREGROUND.value); } diff --git a/src/main/java/org/saturnclient/ui2/elements/Button.java b/src/main/java/org/saturnclient/ui2/elements/Button.java index 73a1a1c..4774f11 100644 --- a/src/main/java/org/saturnclient/ui2/elements/Button.java +++ b/src/main/java/org/saturnclient/ui2/elements/Button.java @@ -13,6 +13,7 @@ public class Button extends Element { public Button(String text, Runnable onClick) { this.text = text; this.onClick = onClick; + this.dimensions(Fonts.getWidth(text, Theme.FONT.value) + 50, 38); } @Override diff --git a/src/main/java/org/saturnclient/ui2/elements/TextureButton.java b/src/main/java/org/saturnclient/ui2/elements/TextureButton.java index 56d8a75..ccbf1ba 100644 --- a/src/main/java/org/saturnclient/ui2/elements/TextureButton.java +++ b/src/main/java/org/saturnclient/ui2/elements/TextureButton.java @@ -11,6 +11,7 @@ import net.minecraft.util.Identifier; public class TextureButton extends Element { Identifier sprite; private Runnable onClick; + static int padding = 14; public TextureButton(Identifier sprite, Runnable onClick) { this.sprite = sprite; @@ -24,10 +25,10 @@ public class TextureButton extends Element { renderScope.setRenderLayer(RenderLayer::getGuiTextured); - int texWidth = width - Theme.PADDING.value; - int texHeight = height - Theme.PADDING.value; + int texWidth = width - padding; + int texHeight = height - padding; - renderScope.drawTexture(sprite, Theme.PADDING.value / 2, Theme.PADDING.value / 2, 0, 0, texWidth, texHeight, + renderScope.drawTexture(sprite, padding / 2, padding / 2, 0, 0, texWidth, texHeight, ctx.isHovering() ? Theme.ACCENT_FG.value : Theme.PRIMARY_FG.value); } diff --git a/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java b/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java index 92866ef..5d5448f 100644 --- a/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java +++ b/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java @@ -25,7 +25,7 @@ public class ShiftMenu extends SaturnScreen { Element button = new Button("Settings", () -> { SaturnClient.client.setScreen(new ModMenu()); - }).center(width, height); + }).center(width, height); draw(button);