From 1a1c2af54866f74efb2e159b31c21d68af08f6b8 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 22 Dec 2025 14:37:08 +0200 Subject: [PATCH] Improved KeyPreset overlay dimensions and colorsfor GuiScriptTextArea --- .../noppes/npcs/client/gui/util/GuiScriptTextArea.java | 8 +++++--- .../npcs/client/gui/util/key/OverlayKeyPresetViewer.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java index 38284c219..7c151d5be 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java @@ -131,8 +131,9 @@ public class GuiScriptTextArea extends GuiNpcTextField { public void initGui() { int endX = x + width, endY = y + height; int xOffset = hasVerticalScrollbar() ? -8 : -2; - KEYS_OVERLAY.elementSpacing = KEYS_OVERLAY.yStartSpacing = 0; - KEYS_OVERLAY.initGui(endX - (width / 2)-3, y + (height / 4) - 10, endX + xOffset - 2, endY - 28); + KEYS_OVERLAY.scale = 0.75f; + KEYS_OVERLAY.borderCol1 = KEYS_OVERLAY.borderCol2 = 0xFF3c3c3c; + KEYS_OVERLAY.initGui(x + (width / 4), y + 20, endX - (width / 4) + 5, endY - 28); KEYS_OVERLAY.viewButton.scale = 0.45f; KEYS_OVERLAY.viewButton.initGui(endX + xOffset, endY - 26); @@ -477,7 +478,8 @@ public class GuiScriptTextArea extends GuiNpcTextField { int wheelDelta = ((GuiNPCInterface) listener).mouseScroll = Mouse.getDWheel(); if (listener instanceof GuiNPCInterface) { ((GuiNPCInterface) listener).mouseScroll = wheelDelta; - if (wheelDelta != 0 && !KEYS_OVERLAY.isVisible()) + boolean canScroll = !KEYS_OVERLAY.isVisible() || KEYS_OVERLAY.isVisible() && !KEYS_OVERLAY.aboveOverlay; + if (wheelDelta != 0 && canScroll) scroll.applyWheelScroll(wheelDelta, maxScroll); } diff --git a/src/main/java/noppes/npcs/client/gui/util/key/OverlayKeyPresetViewer.java b/src/main/java/noppes/npcs/client/gui/util/key/OverlayKeyPresetViewer.java index 9c7b9a400..96d6ece84 100644 --- a/src/main/java/noppes/npcs/client/gui/util/key/OverlayKeyPresetViewer.java +++ b/src/main/java/noppes/npcs/client/gui/util/key/OverlayKeyPresetViewer.java @@ -34,7 +34,7 @@ public class OverlayKeyPresetViewer { public float RELATIVE_MAX_DESC_WIDTH = 0.5f; private final FontRenderer font = Minecraft.getMinecraft().fontRenderer; - public int bgCol1 = 0x88000000, bgCol2 = 0xcc303030; + public int bgCol1 = 0xdd101010, bgCol2 = 0xf8303030; public int borderCol1 = 0x22ffffff, borderCol2 = 0xffffffff; public boolean hasBorder = true; public boolean openOnClick;