mirror of
				https://github.com/ocornut/imgui.git
				synced 2025-11-04 01:34:32 +00:00 
			
		
		
		
	Fixed nav branch merge issue.
This commit is contained in:
		@@ -5520,7 +5520,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
 | 
				
			|||||||
                    ImRect resize_rect(corner, corner + grip.InnerDir * grip_hover_size);
 | 
					                    ImRect resize_rect(corner, corner + grip.InnerDir * grip_hover_size);
 | 
				
			||||||
                    resize_rect.FixInverted();
 | 
					                    resize_rect.FixInverted();
 | 
				
			||||||
                    bool hovered, held;
 | 
					                    bool hovered, held;
 | 
				
			||||||
                    ButtonBehavior(resize_rect, window->GetID((void*)resize_grip_n), &hovered, &held, ImGuiButtonFlags_NoNavFocus);
 | 
					                    ButtonBehavior(resize_rect, window->GetID((void*)resize_grip_n), &hovered, &held, ImGuiButtonFlags_FlattenChilds|ImGuiButtonFlags_NoNavFocus);
 | 
				
			||||||
                    if (hovered || held)
 | 
					                    if (hovered || held)
 | 
				
			||||||
                        g.MouseCursor = (resize_grip_n & 1) ? ImGuiMouseCursor_ResizeNESW : ImGuiMouseCursor_ResizeNWSE;
 | 
					                        g.MouseCursor = (resize_grip_n & 1) ? ImGuiMouseCursor_ResizeNESW : ImGuiMouseCursor_ResizeNWSE;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user