Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-21 07:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Docking: Removed unnecessary ImGuiTabItemFlags_DockedWindow internal flag.

Browse Source
This commit is contained in:
omar 2019-01-31 14:55:00 +01:00
parent e1143377c2
commit 578e15f006
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imgui.cpp
View File

@ -11474,7 +11474,7 @@ static void ImGui::DockNodeUpdateTabBar(ImGuiDockNode* node, ImGuiWindow* host_w
continue; continue;
if (window->LastFrameActive + 1 >= g.FrameCount || !node_was_active) if (window->LastFrameActive + 1 >= g.FrameCount || !node_was_active)
{ {
ImGuiTabItemFlags tab_item_flags = ImGuiTabItemFlags_DockedWindow; ImGuiTabItemFlags tab_item_flags = 0;
if (window->Flags & ImGuiWindowFlags_UnsavedDocument) if (window->Flags & ImGuiWindowFlags_UnsavedDocument)
tab_item_flags |= ImGuiTabItemFlags_UnsavedDocument; tab_item_flags |= ImGuiTabItemFlags_UnsavedDocument;
if (tab_bar->Flags & ImGuiTabBarFlags_NoCloseWithMiddleMouseButton) if (tab_bar->Flags & ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)

3
imgui_internal.h
View File

@ -1397,8 +1397,7 @@ enum ImGuiTabBarFlagsPrivate_
enum ImGuiTabItemFlagsPrivate_ enum ImGuiTabItemFlagsPrivate_
{ {
ImGuiTabItemFlags_DockedWindow = 1 << 20, // [Docking] ImGuiTabItemFlags_Unsorted = 1 << 20, // [Docking] Trailing tabs with the _Unsorted flag will be sorted based on the DockOrder of their Window.
ImGuiTabItemFlags_Unsorted = 1 << 22, // [Docking] Trailing tabs with the _Unsorted flag will be sorted based on the DockOrder of their Window.
ImGuiTabItemFlags_Preview = 1 << 21 // [Docking] Display tab shape for docking preview (height is adjusted slightly to compensate for the yet missing tab bar) ImGuiTabItemFlags_Preview = 1 << 21 // [Docking] Display tab shape for docking preview (height is adjusted slightly to compensate for the yet missing tab bar)
}; };

4
imgui_widgets.cpp
View File

@ -6507,7 +6507,7 @@ bool ImGui::TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open,
{ {
// Drag and drop: re-order tabs // Drag and drop: re-order tabs
float drag_distance_from_edge_x = 0.0f; float drag_distance_from_edge_x = 0.0f;
if (!g.DragDropActive && ((tab_bar->Flags & ImGuiTabBarFlags_Reorderable) || (flags & ImGuiTabItemFlags_DockedWindow))) if (!g.DragDropActive && ((tab_bar->Flags & ImGuiTabBarFlags_Reorderable) || (docked_window != NULL)))
{ {
// While moving a tab it will jump on the other side of the mouse, so we also test for MouseDelta.x // While moving a tab it will jump on the other side of the mouse, so we also test for MouseDelta.x
if (g.IO.MouseDelta.x < 0.0f && g.IO.MousePos.x < bb.Min.x) if (g.IO.MouseDelta.x < 0.0f && g.IO.MousePos.x < bb.Min.x)
@ -6525,7 +6525,7 @@ bool ImGui::TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open,
} }
// Extract a Dockable window out of it's tab bar // Extract a Dockable window out of it's tab bar
if (flags & ImGuiTabItemFlags_DockedWindow) if (docked_window != NULL)
{ {
// We use a variable threshold to distinguish dragging tabs within a tab bar and extracting them out of the tab bar // We use a variable threshold to distinguish dragging tabs within a tab bar and extracting them out of the tab bar
bool undocking_tab = (g.DragDropActive && g.DragDropPayload.SourceId == id); bool undocking_tab = (g.DragDropActive && g.DragDropPayload.SourceId == id);