fix popup on wid mode

tsl0922 · Feb 22, 2024 · c13a969 · c13a969
1 parent 8131062
commit c13a969
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/source/player.cpp b/source/player.cpp
@@ -201,7 +201,7 @@ void Player::initGui() {
   if (config->Data.Interface.Docking) io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
 #endif
 #ifdef IMGUI_HAS_VIEWPORT
-  if (config->Data.Interface.Viewports) io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
+  if (config->Data.Interface.Viewports || config->Data.Mpv.UseWid) io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
 #endif
 
   loadFonts();

diff --git a/source/window.cpp b/source/window.cpp
@@ -397,6 +397,15 @@ void Window::setupWin32Taskbar() {
 LRESULT CALLBACK Window::wndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
   auto win = reinterpret_cast<Window*>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
   switch (uMsg) {
+    case WM_NCLBUTTONDOWN:
+    case WM_NCRBUTTONDOWN:
+    case WM_NCMBUTTONDOWN:
+    case WM_NCXBUTTONDOWN:
+      if (win->config->Data.Mpv.UseWid && ImGui::IsPopupOpen(ImGuiID(0), ImGuiPopupFlags_AnyPopup)) {
+        ImGuiIO& io = ImGui::GetIO();
+        io.AddFocusEvent(false); // may close popup
+      }
+      break;
     case WM_NCACTIVATE:
     case WM_NCPAINT:
       if (win->borderless) return DefWindowProcW(hWnd, uMsg, wParam, lParam);