@ -880,9 +880,7 @@ void ImGui::Scrollbar(ImGuiAxis axis) 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					{  
					 
					 
					 
					{  
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					    ImGuiContext &  g  =  * GImGui ;   
					 
					 
					 
					    ImGuiContext &  g  =  * GImGui ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					    ImGuiWindow *  window  =  g . CurrentWindow ;   
					 
					 
					 
					    ImGuiWindow *  window  =  g . CurrentWindow ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					
 
					 
					 
					 
					 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					    const  ImGuiID  id  =  GetWindowScrollbarID ( window ,  axis ) ;   
					 
					 
					 
					    const  ImGuiID  id  =  GetWindowScrollbarID ( window ,  axis ) ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					    KeepAliveID ( id ) ;   
					 
					 
					 
					 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					
 
					 
					 
					 
					
 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					    // Calculate scrollbar bounding box
   
					 
					 
					 
					    // Calculate scrollbar bounding box
   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					    ImRect  bb  =  GetWindowScrollbarRect ( window ,  axis ) ;   
					 
					 
					 
					    ImRect  bb  =  GetWindowScrollbarRect ( window ,  axis ) ;   
				
			 
			
		
	
	
		
		
			
				
					
						
							
								 
							 
						
						
							
								 
							 
						
						
					 
					 
					@ -920,6 +918,8 @@ bool ImGui::ScrollbarEx(const ImRect& bb_frame, ImGuiID id, ImGuiAxis axis, ImS6 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					    if  ( window - > SkipItems )   
					 
					 
					 
					    if  ( window - > SkipItems )   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					        return  false ;   
					 
					 
					 
					        return  false ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					
 
					 
					 
					 
					
 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					 
					 
					 
					 
					    KeepAliveID ( id ) ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					 
					 
					 
					 
					
 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					    const  float  bb_frame_width  =  bb_frame . GetWidth ( ) ;   
					 
					 
					 
					    const  float  bb_frame_width  =  bb_frame . GetWidth ( ) ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					    const  float  bb_frame_height  =  bb_frame . GetHeight ( ) ;   
					 
					 
					 
					    const  float  bb_frame_height  =  bb_frame . GetHeight ( ) ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					    if  ( bb_frame_width  < =  0.0f  | |  bb_frame_height  < =  0.0f )   
					 
					 
					 
					    if  ( bb_frame_width  < =  0.0f  | |  bb_frame_height  < =  0.0f )