mirror of
				https://github.com/ocornut/imgui.git
				synced 2025-11-04 01:34:32 +00:00 
			
		
		
		
	Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_glfw.cpp # imgui.cpp
This commit is contained in:
		@@ -47,6 +47,12 @@ int main(int, char**)
 | 
			
		||||
    // Setup window
 | 
			
		||||
    SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);
 | 
			
		||||
    SDL_Window* window = SDL_CreateWindow("Dear ImGui SDL2+DirectX11 example", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1280, 720, window_flags);
 | 
			
		||||
    if (window == nullptr)
 | 
			
		||||
    {
 | 
			
		||||
        printf("Error: SDL_CreateWindow(): %s\n", SDL_GetError());
 | 
			
		||||
        return -1;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    SDL_SysWMinfo wmInfo;
 | 
			
		||||
    SDL_VERSION(&wmInfo.version);
 | 
			
		||||
    SDL_GetWindowWMInfo(window, &wmInfo);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user