mirror of
https://github.com/Drezil/imgui.git
synced 2024-11-15 09:27:00 +00:00
Merge branch 'master' into 2016-02-colorpicker
This commit is contained in:
commit
cff815fd2d
@ -4257,6 +4257,7 @@ bool ImGui::Begin(const char* name, bool* p_open, const ImVec2& size_on_first_us
|
|||||||
window->DC.ItemWidthStack.resize(0);
|
window->DC.ItemWidthStack.resize(0);
|
||||||
window->DC.AllowKeyboardFocusStack.resize(0);
|
window->DC.AllowKeyboardFocusStack.resize(0);
|
||||||
window->DC.ButtonRepeatStack.resize(0);
|
window->DC.ButtonRepeatStack.resize(0);
|
||||||
|
window->DC.TextWrapPosStack.resize(0);
|
||||||
window->DC.ColumnsCurrent = 0;
|
window->DC.ColumnsCurrent = 0;
|
||||||
window->DC.ColumnsCount = 1;
|
window->DC.ColumnsCount = 1;
|
||||||
window->DC.ColumnsStartPosY = window->DC.CursorPos.y;
|
window->DC.ColumnsStartPosY = window->DC.CursorPos.y;
|
||||||
|
Loading…
Reference in New Issue
Block a user