Fix quick search close on ESC

Author: Avanatiker

src/main/java/com/lambda/mixin/render/ScreenMixin.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.mixin.render;
+
+import com.lambda.gui.components.QuickSearch;
+import net.minecraft.client.gui.screen.Screen;
+import org.lwjgl.glfw.GLFW;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(Screen.class)
+public class ScreenMixin {
+
+    @Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
+    private void onKeyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) {
+        if (keyCode == GLFW.GLFW_KEY_ESCAPE && QuickSearch.INSTANCE.isOpen()) {
+            QuickSearch.INSTANCE.close();
+            cir.setReturnValue(true);
+        }
+    }
+}

src/main/kotlin/com/lambda/gui/components/QuickSearch.kt

@@ -43,7 +43,8 @@ import kotlin.math.max
 // ToDo: Add support for searching of menu bar entries
 object QuickSearch {
     private val searchInput = ImString(256)
-    private var isOpen = false
+    var isOpen = false
+        private set
     private var shouldFocus = false
 
     private var lastShiftPressTime = 0L
@@ -128,21 +129,6 @@ object QuickSearch {
         ImGui.setNextWindowSizeConstraints(0f, 0f, maxW, maxH)
 
         popupModal("QuickSearch", WINDOW_FLAGS) {
-            // ToDo: Fix close with background click and escape
-            if (ImGui.isKeyPressed(256)) { // ESC key
-                close()
-                ImGui.closeCurrentPopup()
-                return@popupModal
-            }
-
-            //            val bgClick = (ImGui.isMouseClicked(0) || ImGui.isMouseClicked(1)) &&
-            //                    !ImGui.isWindowHovered(ImGuiHoveredFlags.AnyWindow)
-            //            if (bgClick) {
-            //                close()
-            //                ImGui.closeCurrentPopup()
-            //                return@popupModal
-            //            }
-
             if (shouldFocus) {
                 ImGui.setKeyboardFocusHere()
                 shouldFocus = false

src/main/resources/lambda.mixins.common.json

@@ -47,6 +47,7 @@
     "render.PlayerListHudMixin",
     "render.RenderLayersMixin",
     "render.ScreenHandlerMixin",
+    "render.ScreenMixin",
     "render.SplashOverlayMixin",
     "render.SplashOverlayMixin$LogoTextureMixin",
     "render.TooltipComponentMixin",