mirror of
https://github.com/Drezil/imgui.git
synced 2024-11-15 01:17:00 +00:00
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
This commit is contained in:
commit
bfe1e163b8
@ -4255,7 +4255,6 @@ bool ImGui::Begin(const char* name, bool* p_open, const ImVec2& size_on_first_us
|
|||||||
window->DC.AllowKeyboardFocus = true;
|
window->DC.AllowKeyboardFocus = true;
|
||||||
window->DC.ButtonRepeat = false;
|
window->DC.ButtonRepeat = false;
|
||||||
window->DC.ItemWidthStack.resize(0);
|
window->DC.ItemWidthStack.resize(0);
|
||||||
window->DC.TextWrapPosStack.resize(0);
|
|
||||||
window->DC.AllowKeyboardFocusStack.resize(0);
|
window->DC.AllowKeyboardFocusStack.resize(0);
|
||||||
window->DC.ButtonRepeatStack.resize(0);
|
window->DC.ButtonRepeatStack.resize(0);
|
||||||
window->DC.ColumnsCurrent = 0;
|
window->DC.ColumnsCurrent = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user