mirror of
				https://github.com/ocornut/imgui.git
				synced 2025-11-04 01:34:32 +00:00 
			
		
		
		
	Fixed bad merge
This commit is contained in:
		@@ -823,12 +823,6 @@ ImGuiIO::ImGuiIO()
 | 
				
			|||||||
    FontAllowUserScaling = false;
 | 
					    FontAllowUserScaling = false;
 | 
				
			||||||
    DisplayFramebufferScale = ImVec2(1.0f, 1.0f);
 | 
					    DisplayFramebufferScale = ImVec2(1.0f, 1.0f);
 | 
				
			||||||
    DisplayVisibleMin = DisplayVisibleMax = ImVec2(0.0f, 0.0f);
 | 
					    DisplayVisibleMin = DisplayVisibleMax = ImVec2(0.0f, 0.0f);
 | 
				
			||||||
#ifdef __APPLE__
 | 
					 | 
				
			||||||
    WordMovementUsesAltKey = true;      // OS X style: Text editing cursor movement using Alt instead of Ctrl
 | 
					 | 
				
			||||||
    ShortcutsUseSuperKey = true;        // OS X style: Shortcuts using Cmd/Super instead of Ctrl
 | 
					 | 
				
			||||||
    DoubleClickSelectsWord = true;      // OS X style: Double click selects by word instead of selecting whole text
 | 
					 | 
				
			||||||
    MultiSelectUsesSuperKey = true;     // OS X style: Multi-selection in lists uses Cmd/Super instead of Ctrl 
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // User functions
 | 
					    // User functions
 | 
				
			||||||
    RenderDrawListsFn = NULL;
 | 
					    RenderDrawListsFn = NULL;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user