From ccec3f80c799b0127d7402201be63773916826bf Mon Sep 17 00:00:00 2001 From: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com> Date: Fri, 29 Apr 2022 18:01:59 +0200 Subject: fix a bunch of things --- .../java/io/polyfrost/oneconfig/gui/pages/ModConfigPage.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/main/java/io/polyfrost/oneconfig/gui/pages') diff --git a/src/main/java/io/polyfrost/oneconfig/gui/pages/ModConfigPage.java b/src/main/java/io/polyfrost/oneconfig/gui/pages/ModConfigPage.java index 3bae729..9d5dd6e 100644 --- a/src/main/java/io/polyfrost/oneconfig/gui/pages/ModConfigPage.java +++ b/src/main/java/io/polyfrost/oneconfig/gui/pages/ModConfigPage.java @@ -5,6 +5,7 @@ import io.polyfrost.oneconfig.config.data.OptionPage; import io.polyfrost.oneconfig.config.interfaces.BasicOption; import io.polyfrost.oneconfig.lwjgl.RenderManager; import io.polyfrost.oneconfig.lwjgl.font.Fonts; +import org.lwjgl.nanovg.NanoVG; public class ModConfigPage extends Page { private final OptionPage page; @@ -17,12 +18,13 @@ public class ModConfigPage extends Page { @Override public void draw(long vg, int x, int y) { if (page.categories.size() == 0) return; + NanoVG.nvgScissor(vg, x + 14, y, 1056, 800); String selectedCategory = page.categories.keySet().stream().findFirst().get(); int optionX = x + 30; int optionY = y + (page.categories.size() == 1 ? 32 : 72); for (String subCategory : page.categories.get(selectedCategory).keySet()) { RenderManager.drawString(vg, subCategory, x + 18, optionY, OneConfigConfig.WHITE, 24f, Fonts.INTER_MEDIUM); - optionY += 20; + optionY += 26; int backgroundSize = 32; for (int i = 0; i < page.categories.get(selectedCategory).get(subCategory).size(); i++) { @@ -35,9 +37,9 @@ public class ModConfigPage extends Page { continue; } } - backgroundSize += option.getHeight(); + backgroundSize += option.getHeight() + 16; } - RenderManager.drawRoundedRect(vg, x + 14, optionY, 1024, backgroundSize, OneConfigConfig.GRAY_900, 20); + RenderManager.drawRoundedRect(vg, x + 14, optionY, 1024, backgroundSize - 16, OneConfigConfig.GRAY_900, 20); optionY += 16; for (int i = 0; i < page.categories.get(selectedCategory).get(subCategory).size(); i++) { @@ -54,8 +56,9 @@ public class ModConfigPage extends Page { } optionY += option.getHeight() + 16; } - optionY += 8; + optionY += 28; } + NanoVG.nvgResetScissor(vg); } @Override -- cgit