Fix QuickSearch closing on double-shift and click outside

Author: Avanatiker

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

@@ -33,13 +33,14 @@ class ModuleEntry(val module: Module): Layout {
         lambdaTooltip(module.description)
 
         val popupId = "##ctx-${module.name}"
+        val entryId = getId(popupId)
 
         onItemHover(ImGuiHoveredFlags.AllowWhenBlockedByPopup) {
-            if (isMouseClicked() && isPopupOpen(popupId)) suppressedPopupId = popupId
-            if (isMouseReleased() && suppressedPopupId != popupId) openPopup(popupId)
+            if (isMouseClicked() && isPopupOpen(popupId)) suppressedEntryId = entryId
+            if (isMouseReleased() && suppressedEntryId != entryId) openPopup(popupId)
         }
 
-        if (isMouseReleased() && suppressedPopupId == popupId) suppressedPopupId = null
+        if (isMouseReleased() && suppressedEntryId == entryId) suppressedEntryId = null
 
         ImGui.setNextWindowSizeConstraints(0f, 0f, Float.MAX_VALUE, io.displaySize.y * 0.5f)
         popupContextItem(popupId, ImGuiPopupFlags.None) {
@@ -48,7 +49,7 @@ class ModuleEntry(val module: Module): Layout {
     }
 
     private companion object {
-        /** Popup whose reopen is pending suppression; only one item can be pressed at a time. */
-        var suppressedPopupId: String? = null
+        /** Entry whose reopen is pending suppression; only one item can be pressed at a time. */
+        var suppressedEntryId: Int? = null
     }
 }

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

@@ -29,7 +29,9 @@ import com.lambda.gui.LambdaScreen
 import com.lambda.gui.Layout
 import com.lambda.gui.dsl.ImGuiBuilder
 import com.lambda.imgui.ImGui
+import com.lambda.imgui.flag.ImGuiHoveredFlags
 import com.lambda.imgui.flag.ImGuiInputTextFlags
+import com.lambda.imgui.flag.ImGuiMouseButton
 import com.lambda.imgui.flag.ImGuiStyleVar
 import com.lambda.imgui.flag.ImGuiWindowFlags
 import com.lambda.imgui.type.ImString
@@ -50,12 +52,13 @@ object QuickSearch {
     var isOpen = false
         private set
     private var shouldFocus = false
-
+    private var pendingClose = false
     private var lastShiftPressTime = 0L
     private var lastShiftKeyCode = -1
 
     private const val DOUBLE_SHIFT_WINDOW_MS = 500L
     private const val MAX_RESULTS = 50
+    private const val POPUP_ID = "QuickSearch"
     const val WINDOW_FLAGS =
         ImGuiWindowFlags.AlwaysAutoResize or
                 ImGuiWindowFlags.NoTitleBar or
@@ -119,21 +122,23 @@ object QuickSearch {
     fun open() {
         isOpen = true
         shouldFocus = true
+        pendingClose = false
         searchInput.clear()
     }
 
     fun close() {
         isOpen = false
         shouldFocus = false
+        pendingClose = true
     }
 
     fun toggle() {
         if (isOpen) close() else open()
     }
 
     fun ImGuiBuilder.renderQuickSearch() {
-        if (!isOpen) return
-        ImGui.openPopup("QuickSearch")
+        if (!isOpen && !pendingClose) return
+        if (isOpen) openPopup(POPUP_ID)
 
         ImGui.setNextFrameWantCaptureKeyboard(true)
 
@@ -146,7 +151,18 @@ object QuickSearch {
         ImGui.setNextWindowSize(maxW, 0f)
         ImGui.setNextWindowSizeConstraints(0f, 0f, maxW, maxH)
 
-        popupModal("QuickSearch", WINDOW_FLAGS) {
+        popupModal(POPUP_ID, WINDOW_FLAGS) {
+            if (pendingClose) {
+                pendingClose = false
+                closeCurrentPopup()
+                return@popupModal
+            }
+
+            if (isMouseClicked(ImGuiMouseButton.Left) && !isWindowHovered(ImGuiHoveredFlags.RootAndChildWindows)) {
+                close()
+                return@popupModal
+            }
+
             if (shouldFocus) {
                 ImGui.setKeyboardFocusHere()
                 shouldFocus = false
@@ -315,7 +331,7 @@ object QuickSearch {
         if (lastShiftKeyCode == event.keyCode &&
             currentTime - lastShiftPressTime <= DOUBLE_SHIFT_WINDOW_MS
         ) {
-            open()
+            toggle()
             lastShiftPressTime = 0L
             lastShiftKeyCode = -1
         } else {