Docking: fixed settings load issue when mouse wheeling. (#4310)
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 62fbe77..3f106c2 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -99,6 +99,11 @@
Note that Linux/Mac still have inconsistent support for multi-viewports. If you want to help see https://github.com/ocornut/imgui/issues/2117.
+Docking+Viewports Branch:
+
+- Docking: fixed settings load issue when mouse wheeling. (#4310)
+
+
-----------------------------------------------------------------------
VERSION 1.84.1 (Released 2021-08-20)
-----------------------------------------------------------------------
diff --git a/imgui.cpp b/imgui.cpp
index bc1616e..bc425d7 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -13111,7 +13111,10 @@
DockNodeMoveWindows(new_node, node);
DockSettingsRenameNodeReferences(node->ID, new_node->ID);
for (int n = 0; n < new_node->Windows.Size; n++)
+ {
+ new_node->Windows[n]->Flags &= ~ImGuiWindowFlags_ChildWindow;
UpdateWindowParentAndRootLinks(new_node->Windows[n], new_node->Windows[n]->Flags, NULL);
+ }
node = new_node;
}
else
@@ -13293,7 +13296,8 @@
window->DockNode = NULL;
window->DockIsActive = window->DockTabWantClose = false;
window->DockId = save_dock_id;
- UpdateWindowParentAndRootLinks(window, window->Flags & ~ImGuiWindowFlags_ChildWindow, NULL); // Update immediately
+ window->Flags &= ~ImGuiWindowFlags_ChildWindow;
+ UpdateWindowParentAndRootLinks(window, window->Flags, NULL); // Update immediately
// Remove window
bool erased = false;
