mirror of
				https://github.com/Drezil/imgui.git
				synced 2025-11-04 07:01:04 +01:00 
			
		
		
		
	Viewport: Enabled viewports by default in more example apps.
This commit is contained in:
		@@ -33,10 +33,11 @@ int main(int, char**)
 | 
			
		||||
    IMGUI_CHECKVERSION();
 | 
			
		||||
    ImGui::CreateContext();
 | 
			
		||||
    ImGuiIO& io = ImGui::GetIO(); (void)io;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;  // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;       // Enable Keyboard Controls
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;      // Enable Gamepad Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;         // Enable Multi-Viewport / Platform Windows
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoMerge;
 | 
			
		||||
 | 
			
		||||
    ImGui_ImplGlfw_InitForOpenGL(window, true);
 | 
			
		||||
    ImGui_ImplOpenGL2_Init();
 | 
			
		||||
 
 | 
			
		||||
@@ -76,11 +76,11 @@ int main(int, char**)
 | 
			
		||||
    IMGUI_CHECKVERSION();
 | 
			
		||||
    ImGui::CreateContext();
 | 
			
		||||
    ImGuiIO& io = ImGui::GetIO(); (void)io;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoMerge;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;       // Enable Keyboard Controls
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;      // Enable Gamepad Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;         // Enable Multi-Viewport / Platform Windows
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoMerge;
 | 
			
		||||
 | 
			
		||||
    ImGui_ImplGlfw_InitForOpenGL(window, true);
 | 
			
		||||
    ImGui_ImplOpenGL3_Init(glsl_version);
 | 
			
		||||
 
 | 
			
		||||
@@ -347,10 +347,11 @@ int main(int, char**)
 | 
			
		||||
    IMGUI_CHECKVERSION();
 | 
			
		||||
    ImGui::CreateContext();
 | 
			
		||||
    ImGuiIO& io = ImGui::GetIO(); (void)io;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;  // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;       // Enable Keyboard Controls
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;      // Enable Gamepad Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;         // Enable Multi-Viewport / Platform Windows
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoMerge;
 | 
			
		||||
 | 
			
		||||
    // Setup GLFW binding
 | 
			
		||||
    ImGui_ImplGlfw_InitForVulkan(window, true);
 | 
			
		||||
 
 | 
			
		||||
@@ -38,7 +38,10 @@ int main(int, char**)
 | 
			
		||||
    IMGUI_CHECKVERSION();
 | 
			
		||||
    ImGui::CreateContext();
 | 
			
		||||
    ImGuiIO& io = ImGui::GetIO(); (void)io;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;  // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;       // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;         // Enable Multi-Viewport / Platform Windows
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoMerge;
 | 
			
		||||
 | 
			
		||||
    ImGui_ImplSDL2_InitForOpenGL(window, gl_context);
 | 
			
		||||
    ImGui_ImplOpenGL2_Init();
 | 
			
		||||
 
 | 
			
		||||
@@ -76,9 +76,10 @@ int main(int, char**)
 | 
			
		||||
    IMGUI_CHECKVERSION();
 | 
			
		||||
    ImGui::CreateContext();
 | 
			
		||||
    ImGuiIO& io = ImGui::GetIO(); (void)io;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;  // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;       // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;         // Enable Multi-Viewport / Platform Windows
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoMerge;
 | 
			
		||||
 | 
			
		||||
    ImGui_ImplSDL2_InitForOpenGL(window, gl_context);
 | 
			
		||||
    ImGui_ImplOpenGL3_Init(glsl_version);
 | 
			
		||||
 
 | 
			
		||||
@@ -335,9 +335,10 @@ int main(int, char**)
 | 
			
		||||
    // Setup Dear ImGui binding
 | 
			
		||||
    ImGui::CreateContext();
 | 
			
		||||
    ImGuiIO& io = ImGui::GetIO(); (void)io;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;  // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;       // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;         // Enable Multi-Viewport / Platform Windows
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoMerge;
 | 
			
		||||
 | 
			
		||||
    // Setup SDL binding
 | 
			
		||||
    ImGui_ImplSDL2_InitForVulkan(window);
 | 
			
		||||
 
 | 
			
		||||
@@ -118,9 +118,10 @@ int main(int, char**)
 | 
			
		||||
    IMGUI_CHECKVERSION();
 | 
			
		||||
    ImGui::CreateContext();
 | 
			
		||||
    ImGuiIO& io = ImGui::GetIO(); (void)io;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;  // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;       // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;         // Enable Multi-Viewport / Platform Windows
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoMerge;
 | 
			
		||||
 | 
			
		||||
    ImGui_ImplWin32_Init(hwnd);
 | 
			
		||||
    ImGui_ImplDX10_Init(g_pd3dDevice);
 | 
			
		||||
 
 | 
			
		||||
@@ -134,12 +134,13 @@ int main(int, char**)
 | 
			
		||||
    IMGUI_CHECKVERSION();
 | 
			
		||||
    ImGui::CreateContext();
 | 
			
		||||
    ImGuiIO& io = ImGui::GetIO(); (void)io;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;       // Enable Keyboard Controls
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;      // Enable Gamepad Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;         // Enable Multi-Viewport / Platform Windows
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoMerge;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_DpiEnableScaleFonts;     // FIXME-DPI: THIS CURRENTLY DOESN'T WORK AS EXPECTED. DON'T USE IN USER APP!
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_DpiEnableScaleViewports;
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;  // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_DpiEnableScaleViewports; // FIXME-DPI
 | 
			
		||||
 | 
			
		||||
    ImGui_ImplWin32_Init(hwnd);
 | 
			
		||||
    ImGui_ImplDX11_Init(g_pd3dDevice, g_pd3dDeviceContext);
 | 
			
		||||
 
 | 
			
		||||
@@ -290,8 +290,10 @@ int main(int, char**)
 | 
			
		||||
    IMGUI_CHECKVERSION();
 | 
			
		||||
    ImGui::CreateContext();
 | 
			
		||||
    ImGuiIO& io = ImGui::GetIO(); (void)io;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;  // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;       // Enable Keyboard Controls
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;       // Enable Multi-Viewport / Platform Windows (FIXME: Currently broken in DX12 back-end, need some work!)
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoMerge;
 | 
			
		||||
 | 
			
		||||
    ImGui_ImplWin32_Init(hwnd);
 | 
			
		||||
    ImGui_ImplDX12_Init(g_pd3dDevice, NUM_FRAMES_IN_FLIGHT, 
 | 
			
		||||
 
 | 
			
		||||
@@ -79,7 +79,11 @@ int main(int, char**)
 | 
			
		||||
    IMGUI_CHECKVERSION();
 | 
			
		||||
    ImGui::CreateContext();
 | 
			
		||||
    ImGuiIO& io = ImGui::GetIO(); (void)io;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;  // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;       // Enable Keyboard Controls
 | 
			
		||||
    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;         // Enable Multi-Viewport / Platform Windows
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons;
 | 
			
		||||
    //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoMerge;
 | 
			
		||||
 | 
			
		||||
    ImGui_ImplWin32_Init(hwnd);
 | 
			
		||||
    ImGui_ImplDX9_Init(g_pd3dDevice);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user