Fix right click closing of module settings

Author: Avanatiker

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

@@ -21,6 +21,8 @@ import com.lambda.gui.Layout
 import com.lambda.gui.components.SettingsWidget.buildConfigSettingsContext
 import com.lambda.gui.dsl.ImGuiBuilder
 import com.lambda.imgui.ImGui
+import com.lambda.imgui.flag.ImGuiHoveredFlags
+import com.lambda.imgui.flag.ImGuiPopupFlags
 import com.lambda.module.Module
 
 class ModuleEntry(val module: Module): Layout {
@@ -30,9 +32,23 @@ class ModuleEntry(val module: Module): Layout {
         }
         lambdaTooltip(module.description)
 
+        val popupId = "##ctx-${module.name}"
+
+        onItemHover(ImGuiHoveredFlags.AllowWhenBlockedByPopup) {
+            if (isMouseClicked() && isPopupOpen(popupId)) suppressedPopupId = popupId
+            if (isMouseReleased() && suppressedPopupId != popupId) openPopup(popupId)
+        }
+
+        if (isMouseReleased() && suppressedPopupId == popupId) suppressedPopupId = null
+
         ImGui.setNextWindowSizeConstraints(0f, 0f, Float.MAX_VALUE, io.displaySize.y * 0.5f)
-        popupContextItem("##ctx-${module.name}") {
+        popupContextItem(popupId, ImGuiPopupFlags.None) {
             buildConfigSettingsContext(module)
         }
     }
+
+    private companion object {
+        /** Popup whose reopen is pending suppression; only one item can be pressed at a time. */
+        var suppressedPopupId: String? = null
+    }
 }

src/main/kotlin/com/lambda/gui/dsl/ImGuiBuilder.kt

@@ -295,6 +295,23 @@ object ImGuiBuilder {
     fun onItemClick(button: Int = ImGuiMouseButton.Right, block: ProcedureBlock) =
         if (isItemClicked(button)) block() else Unit
 
+    /**
+     * Returns whether [button] went down this frame, regardless of what is hovered.
+     *
+     * Unlike [onItemClick] this does not imply the last item is hovered, so it can be combined with
+     * [onItemHover] to observe clicks on items that are blocked by an open popup.
+     */
+    @ImGuiDsl
+    fun isMouseClicked(button: Int = ImGuiMouseButton.Right, repeat: Boolean = false): Boolean =
+        ImGui.isMouseClicked(button, repeat)
+
+    /**
+     * Returns whether [button] was released this frame, regardless of what is hovered.
+     */
+    @ImGuiDsl
+    fun isMouseReleased(button: Int = ImGuiMouseButton.Right): Boolean =
+        ImGui.isMouseReleased(button)
+
     /**
      * Returns whether:
      *  - The last item modified its value in this frame
@@ -1586,6 +1603,15 @@ object ImGuiBuilder {
     fun openPopup(strId: String, flags: Int = ImGuiPopupFlags.None) =
         ImGui.openPopup(strId, flags)
 
+    /**
+     * Returns whether the popup identified by [strId] is currently open.
+     *
+     * The id is resolved against the current window, matching [openPopup] and the `popupContext*` helpers.
+     */
+    @ImGuiDsl
+    fun isPopupOpen(strId: String, flags: Int = ImGuiPopupFlags.None): Boolean =
+        ImGui.isPopupOpen(strId, flags)
+
     /**
      * Creates a popup. You must first call [openPopup] with the same [strId]
      *