From 8fa22e1e60992eb0ba904638cfe6d570642702dc Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 26 Jan 2026 04:56:42 +0200 Subject: [PATCH] Moved fullscreen button mouseClicked into GuiScriptTextArea --- src/main/java/noppes/npcs/client/gui/GuiScript.java | 9 --------- .../npcs/client/gui/script/GuiScriptInterface.java | 6 ------ .../noppes/npcs/client/gui/util/GuiScriptTextArea.java | 4 ++++ 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/GuiScript.java b/src/main/java/noppes/npcs/client/gui/GuiScript.java index a289761b0..d7ea08e54 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiScript.java +++ b/src/main/java/noppes/npcs/client/gui/GuiScript.java @@ -370,13 +370,4 @@ public class GuiScript extends GuiScriptInterface { initGui(); } } - - @Override - public void mouseClicked(int mouseX, int mouseY, int mouseButton) { - // Check fullscreen button first when in script view - if (showScript && fullscreenButton.mouseClicked(mouseX, mouseY, mouseButton)) { - return; - } - super.mouseClicked(mouseX, mouseY, mouseButton); - } } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java index 40cfe103f..f461c66f6 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java @@ -394,12 +394,6 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb return; } - // Check fullscreen button first when on script editor tab - // Skip for useSettingsToggle GUIs (like GuiScript) - they handle this themselves - if (this.activeTab > 0 && !useSettingsToggle && !handler.isSingleContainer() && fullscreenButton.mouseClicked(mouseX, mouseY, mouseButton)) { - return; - } - super.mouseClicked(mouseX, mouseY, mouseButton); } 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 da994eb4f..e3067a5e7 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java @@ -2429,6 +2429,10 @@ public class GuiScriptTextArea extends GuiNpcTextField { if (autocompleteManager.isVisible()) { autocompleteManager.dismiss(); } + + if (parent != null && parent.fullscreenButton.mouseClicked(xMouse, yMouse, mouseButton)) + return; + // Check go to line dialog clicks first if (goToLineDialog.isVisible() && goToLineDialog.mouseClicked(xMouse, yMouse, mouseButton)) {