From c2dcc806600fecef78be565bb9d6a293dcc20e87 Mon Sep 17 00:00:00 2001 From: ocornut Date: Thu, 30 Jan 2025 11:39:52 +0100 Subject: [PATCH] Docking: fixed ImGuiWindowFlags_DockNodeHost/ImGuiWindowFlags_NavFlattened clash introduced by c38c18c1a just for 1.91.7 (#8357) --- docs/CHANGELOG.txt | 3 +++ imgui.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 929d45c39..ede5c1ba8 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -108,6 +108,9 @@ Other changes: Docking+Viewports Branch: +- Docking: Fixed an issue in 1.91.7 where using legacy ImGuiWindowFlags_NavFlattened + flag (instead of ImGuiChildFlags_NavFlattened) in docking branch would conflict + with internal docking flags. (#8357) [@DanielGibson] - Backends: SDL3: new viewport windows are created with the SDL_WINDOW_HIDDEN flag before calling SDL_ShowWindow(). (#8328) [@PathogenDavid] diff --git a/imgui.h b/imgui.h index 6d0918ef7..8cf98a25b 100644 --- a/imgui.h +++ b/imgui.h @@ -1132,12 +1132,12 @@ enum ImGuiWindowFlags_ ImGuiWindowFlags_NoInputs = ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus, // [Internal] + ImGuiWindowFlags_DockNodeHost = 1 << 23, // Don't use! For internal use by Begin()/NewFrame() ImGuiWindowFlags_ChildWindow = 1 << 24, // Don't use! For internal use by BeginChild() ImGuiWindowFlags_Tooltip = 1 << 25, // Don't use! For internal use by BeginTooltip() ImGuiWindowFlags_Popup = 1 << 26, // Don't use! For internal use by BeginPopup() ImGuiWindowFlags_Modal = 1 << 27, // Don't use! For internal use by BeginPopupModal() ImGuiWindowFlags_ChildMenu = 1 << 28, // Don't use! For internal use by BeginMenu() - ImGuiWindowFlags_DockNodeHost = 1 << 29, // Don't use! For internal use by Begin()/NewFrame() // Obsolete names #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS