From 0d6e3ab2b037a7c789b01eb78e00297c04fc52ca Mon Sep 17 00:00:00 2001 From: omar Date: Wed, 2 Jan 2019 18:56:53 +0100 Subject: [PATCH] Docking: Renamed SetNextWindowId() -> SetNextWindowID() for consistency. (function vs member are still horribly inconsistent atm) --- imgui.cpp | 4 ++-- imgui.h | 4 ++-- imgui_demo.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index c880763e..84e37289 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -6263,7 +6263,7 @@ bool ImGui::IsWindowFocused(ImGuiFocusedFlags flags) } } -ImGuiID ImGui::GetWindowDockId() +ImGuiID ImGui::GetWindowDockID() { ImGuiContext& g = *GImGui; return g.CurrentWindow->DockId; @@ -6524,7 +6524,7 @@ void ImGui::SetNextWindowViewport(ImGuiID id) g.NextWindowData.ViewportId = id; } -void ImGui::SetNextWindowDockId(ImGuiID id, ImGuiCond cond) +void ImGui::SetNextWindowDockID(ImGuiID id, ImGuiCond cond) { ImGuiContext& g = *GImGui; g.NextWindowData.DockCond = cond ? cond : ImGuiCond_Always; diff --git a/imgui.h b/imgui.h index 4873222a..b4745319 100644 --- a/imgui.h +++ b/imgui.h @@ -580,9 +580,9 @@ namespace ImGui // Use DockSpace() to create an explicit dock node _within_ an existing window. See Docking demo for details. IMGUI_API void DockSpace(ImGuiID id, const ImVec2& size = ImVec2(0, 0), ImGuiDockNodeFlags flags = 0, const ImGuiWindowClass* window_class = NULL); IMGUI_API ImGuiID DockSpaceOverViewport(ImGuiViewport* viewport = NULL, ImGuiDockNodeFlags dockspace_flags = 0, const ImGuiWindowClass* window_class = NULL); - IMGUI_API void SetNextWindowDockId(ImGuiID dock_id, ImGuiCond cond = 0); // set next window dock id (FIXME-DOCK) + IMGUI_API void SetNextWindowDockID(ImGuiID dock_id, ImGuiCond cond = 0); // set next window dock id (FIXME-DOCK) IMGUI_API void SetNextWindowClass(const ImGuiWindowClass* window_class); // set next window class / user type (docking filters by same user_type) - IMGUI_API ImGuiID GetWindowDockId(); + IMGUI_API ImGuiID GetWindowDockID(); IMGUI_API bool IsWindowDocked(); // is current window docked into another window? // Logging/Capture diff --git a/imgui_demo.cpp b/imgui_demo.cpp index 317e59dc..acd557d6 100644 --- a/imgui_demo.cpp +++ b/imgui_demo.cpp @@ -4275,7 +4275,7 @@ void ShowExampleAppDocuments(bool* p_open) // FIXME-DOCK: SetNextWindowDock() //ImGuiID default_dock_id = GetDockspaceRootDocumentDockID(); //ImGuiID default_dock_id = GetDockspacePreferedDocumentDockID(); - ImGui::SetNextWindowDockId(dockspace_id, redock_all ? ImGuiCond_Always : ImGuiCond_FirstUseEver); + ImGui::SetNextWindowDockID(dockspace_id, redock_all ? ImGuiCond_Always : ImGuiCond_FirstUseEver); ImGuiWindowFlags window_flags = (doc->Dirty ? ImGuiWindowFlags_UnsavedDocument : 0); bool visible = ImGui::Begin(doc->Name, &doc->Open, window_flags);