eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-04 09:08:52 +01:00
Code Issues 156 Wiki Activity

Merge pull request #219 from MaSzyna-EU07/fix/imgui-viewport-windows

Browse Source 
fix(ui): panels dragged out of the simulator window get no taskbar or…
This commit is contained in:
Hirek
2026-10-21 09:00:06 +02:00
committed by GitHub
parent 7a07e862d1 746399c771
commit 09a7e1e5ef
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/uilayer.cpp
View File

@@ -22,6 +22,7 @@ http://mozilla.org/MPL/2.0/.
#include "application/editoruilayer.h" #include "application/editoruilayer.h"
#include "imgui/imgui_impl_glfw.h" #include "imgui/imgui_impl_glfw.h"
#include "imgui/imgui_internal.h"
GLFWwindow *ui_layer::m_window{nullptr}; GLFWwindow *ui_layer::m_window{nullptr};
GLFWwindow *ui_layer::m_keywindow{nullptr}; GLFWwindow *ui_layer::m_keywindow{nullptr};
@@ -174,6 +175,10 @@ void create_viewport_window(ImGuiViewport *Viewport)
imgui_create_window(Viewport); imgui_create_window(Viewport);
if (Viewport->PlatformHandle != nullptr) if (Viewport->PlatformHandle != nullptr)
glfwSetKeyCallback(static_cast<GLFWwindow *>(Viewport->PlatformHandle), ui_layer::viewport_key_callback); glfwSetKeyCallback(static_cast<GLFWwindow *>(Viewport->PlatformHandle), ui_layer::viewport_key_callback);
#ifdef _WIN32
if (Viewport->PlatformHandleRaw != nullptr)
::SetWindowLongPtr(static_cast<HWND>(Viewport->PlatformHandleRaw), GWLP_HWNDPARENT, reinterpret_cast<LONG_PTR>(ImGui::GetMainViewport()->PlatformHandleRaw));
#endif
} }
} // namespace } // namespace
@@ -283,6 +288,8 @@ bool ui_layer::init(GLFWwindow *Window)
IMGUI_CHECKVERSION(); IMGUI_CHECKVERSION();
ImGui::CreateContext(); ImGui::CreateContext();
m_imguiio = &ImGui::GetIO(); m_imguiio = &ImGui::GetIO();
ImGui::GetCurrentContext()->ConfigNavWindowingKeyNext = ImGuiKey_None;
ImGui::GetCurrentContext()->ConfigNavWindowingKeyPrev = ImGuiKey_None;
// imgui.ini is read with the first frame, which may be of another mode than the editor // imgui.ini is read with the first frame, which may be of another mode than the editor
editor_ui::register_settings(); editor_ui::register_settings();
@@ -395,6 +402,7 @@ bool ui_layer::init(GLFWwindow *Window)
if (Global.ui_viewports && viewportsupport) if (Global.ui_viewports && viewportsupport)
{ {
m_imguiio->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable; m_imguiio->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
m_imguiio->ConfigViewportsNoTaskBarIcon = true;
auto &platformio{ImGui::GetPlatformIO()}; auto &platformio{ImGui::GetPlatformIO()};
imgui_create_window = platformio.Platform_CreateWindow; imgui_create_window = platformio.Platform_CreateWindow;
platformio.Platform_CreateWindow = create_viewport_window; platformio.Platform_CreateWindow = create_viewport_window;