mirror of
https://github.com/Drezil/imgui.git
synced 2024-12-24 16:46:36 +00:00
Docking: Fixed dragging docked window with _NoMove flag (#2325)
This commit is contained in:
parent
7227454dca
commit
80d51c692a
@ -5925,8 +5925,9 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
|
|||||||
// Docking: Dragging a dockable window (or any of its child) turns it into a drag and drop source.
|
// Docking: Dragging a dockable window (or any of its child) turns it into a drag and drop source.
|
||||||
// We need to do this _before_ we overwrite window->DC.LastItemId below because BeginAsDockableDragDropSource() also overwrites it.
|
// We need to do this _before_ we overwrite window->DC.LastItemId below because BeginAsDockableDragDropSource() also overwrites it.
|
||||||
if ((g.ActiveId == window->MoveId) && ((g.IO.ConfigDockingWithShift && g.IO.KeyShift) || (!g.IO.ConfigDockingWithShift)))
|
if ((g.ActiveId == window->MoveId) && ((g.IO.ConfigDockingWithShift && g.IO.KeyShift) || (!g.IO.ConfigDockingWithShift)))
|
||||||
if ((window->RootWindow->Flags & (ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDocking)) == 0)
|
if ((window->Flags & ImGuiWindowFlags_NoMove) == 0)
|
||||||
BeginAsDockableDragDropSource(window);
|
if ((window->RootWindow->Flags & (ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDocking)) == 0)
|
||||||
|
BeginAsDockableDragDropSource(window);
|
||||||
|
|
||||||
// Docking: Any dockable window can act as a target. For dock node hosts we call BeginAsDockableDragDropTarget() in DockNodeUpdate() instead.
|
// Docking: Any dockable window can act as a target. For dock node hosts we call BeginAsDockableDragDropTarget() in DockNodeUpdate() instead.
|
||||||
if (g.DragDropActive && !(flags & ImGuiWindowFlags_NoDocking))
|
if (g.DragDropActive && !(flags & ImGuiWindowFlags_NoDocking))
|
||||||
|
Loading…
Reference in New Issue
Block a user