mirror of
https://github.com/ocornut/imgui.git
synced 2026-02-04 04:00:07 +00:00
Merge branch 'master' into docking
# Conflicts: # docs/CHANGELOG.txt # imgui_internal.h
This commit is contained in:
commit
aa81272900
6 changed files with 232 additions and 227 deletions
|
|
@ -9159,6 +9159,7 @@ bool ImGui::BeginTabBarEx(ImGuiTabBar* tab_bar, const ImRect& tab_bar_bb, ImG
|
|||
// Add to stack
|
||||
g.CurrentTabBarStack.push_back(GetTabBarRefFromTabBar(tab_bar));
|
||||
g.CurrentTabBar = tab_bar;
|
||||
tab_bar->Window = window;
|
||||
|
||||
// Append with multiple BeginTabBar()/EndTabBar() pairs.
|
||||
tab_bar->BackupCursorPos = window->DC.CursorPos;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue