diff --git a/imgui-binding/src/main/java/imgui/ImGui.java b/imgui-binding/src/main/java/imgui/ImGui.java index e9f1ec6..a446080 100644 --- a/imgui-binding/src/main/java/imgui/ImGui.java +++ b/imgui-binding/src/main/java/imgui/ImGui.java @@ -285,6 +285,24 @@ public class ImGui { ImGui::ShowMetricsWindow(&pOpen[0]); */ + /** + * Create Stack Tool window. hover items with mouse to query information about the source of their unique ID. + */ + public static void showStackToolWindow(ImBoolean pOpen) { + nShowMetricsWindow(pOpen.getData()); + } + + /** + * Create Stack Tool window. hover items with mouse to query information about the source of their unique ID. + */ + public static native void showStackToolWindow(); /* + ImGui::ShowStackToolWindow(); + */ + + private static native void nShowStackToolWindow(boolean[] pOpen); /* + ImGui::ShowStackToolWindow(&pOpen[0]); + */ + /** * Create About window. display Dear ImGui version, credits and build/system information. */ diff --git a/imgui-binding/src/main/java/imgui/flag/ImGuiFocusedFlags.java b/imgui-binding/src/main/java/imgui/flag/ImGuiFocusedFlags.java index 71020f2..307fed1 100644 --- a/imgui-binding/src/main/java/imgui/flag/ImGuiFocusedFlags.java +++ b/imgui-binding/src/main/java/imgui/flag/ImGuiFocusedFlags.java @@ -8,18 +8,32 @@ public final class ImGuiFocusedFlags { } public static final int None = 0; + /** - * IsWindowFocused(): Return true if any children of the window is focused + * Return true if any children of the window is focused */ public static final int ChildWindows = 1; + /** - * IsWindowFocused(): Test from root window (top most parent of the current hierarchy) + * Test from root window (top most parent of the current hierarchy) */ public static final int RootWindow = 1 << 1; + /** - * IsWindowFocused(): Return true if any window is focused. - * Important: If you are trying to tell how to dispatch your low-level inputs, do NOT use this. Use 'io.WantCaptureMouse' instead! Please read the FAQ! + * Return true if any window is focused. Important: If you are trying to tell how to dispatch your low-level inputs, do NOT use this. + * Use 'io.WantCaptureMouse' instead! Please read the FAQ! */ public static final int AnyWindow = 1 << 2; + + /** + * Do not consider popup hierarchy (do not treat popup emitter as parent of popup) (when used with _ChildWindows or _RootWindow) + */ + public static final int NoPopupHierarchy = 1 << 3; + + /** + * Consider docking hierarchy (treat dockspace host as parent of docked window) (when used with _ChildWindows or _RootWindow) + */ + public static final int DockHierarchy = 1 << 4; + public static final int RootAndChildWindows = RootWindow | ChildWindows; } diff --git a/imgui-binding/src/main/java/imgui/flag/ImGuiHoveredFlags.java b/imgui-binding/src/main/java/imgui/flag/ImGuiHoveredFlags.java index fed145e..62f5fba 100644 --- a/imgui-binding/src/main/java/imgui/flag/ImGuiHoveredFlags.java +++ b/imgui-binding/src/main/java/imgui/flag/ImGuiHoveredFlags.java @@ -13,35 +13,55 @@ public final class ImGuiHoveredFlags { * Return true if directly over the item/window, not obstructed by another window, not obstructed by an active popup or modal blocking inputs under them. */ public static final int None = 0; + /** * IsWindowHovered() only: Return true if any children of the window is hovered */ public static final int ChildWindows = 1; + /** * IsWindowHovered() only: Test from root window (top most parent of the current hierarchy) */ public static final int RootWindow = 1 << 1; + /** * IsWindowHovered() only: Return true if any window is hovered */ public static final int AnyWindow = 1 << 2; + + /** + * IsWindowHovered() only: Do not consider popup hierarchy (do not treat popup emitter as parent of popup) (when used with _ChildWindows or _RootWindow) + */ + public static final int NoPopupHierarchy = 1 << 3; + + /** + * IsWindowHovered() only: Consider docking hierarchy (treat dockspace host as parent of docked window) (when used with _ChildWindows or _RootWindow) + */ + public static final int DockHierarchy = 1 << 4; + /** * Return true even if a popup window is normally blocking access to this item/window */ - public static final int AllowWhenBlockedByPopup = 1 << 3; - //ImGuiHoveredFlags_AllowWhenBlockedByModal = 1 << 4, //Return true even if a modal popup window is normally blocking access to this item/window. FIXME-TODO: Unavailable yet. + public static final int AllowWhenBlockedByPopup = 1 << 5; + + //ImGuiHoveredFlags_AllowWhenBlockedByModal = 1 << 6, //Return true even if a modal popup window is normally blocking access to this item/window. FIXME-TODO: Unavailable yet. + /** * Return true even if an active item is blocking access to this item/window. Useful for Drag and Drop patterns. */ - public static final int AllowWhenBlockedByActiveItem = 1 << 5; + public static final int AllowWhenBlockedByActiveItem = 1 << 7; + /** * Return true even if the position is obstructed or overlapped by another window */ - public static final int AllowWhenOverlapped = 1 << 6; + public static final int AllowWhenOverlapped = 1 << 8; + /** * Return true even if the item is disabled */ - public static final int AllowWhenDisabled = 1 << 7; + public static final int AllowWhenDisabled = 1 << 9; + public static final int RectOnly = AllowWhenBlockedByPopup | AllowWhenBlockedByActiveItem | AllowWhenOverlapped; + public static final int RootAndChildWindows = RootWindow | ChildWindows; } diff --git a/include/imgui b/include/imgui index 0eb45a0..1b215ec 160000 --- a/include/imgui +++ b/include/imgui @@ -1 +1 @@ -Subproject commit 0eb45a057783ab4ad0aa5b6ce7fadb87ba3b5afe +Subproject commit 1b215ecb018ba0fd170618366ddc4be9bd45f283 diff --git a/include/imgui-node-editor b/include/imgui-node-editor index 687a72f..d79ebde 160000 --- a/include/imgui-node-editor +++ b/include/imgui-node-editor @@ -1 +1 @@ -Subproject commit 687a72f940c76cf5064e13fe55fa0408c18fcbe4 +Subproject commit d79ebdeb2375fa6c1f88a40e52e7d08c8d472b62