mirror of
				https://github.com/ocornut/imgui.git
				synced 2025-11-04 09:44:29 +00:00 
			
		
		
		
	Merge remote-tracking branch 'origin' into 2016-02-colorpicker
This commit is contained in:
		@@ -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;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user