replace cursor visibility with mouse capture

Kenix3 · Dec 18, 2024 · 34d4d5c · 34d4d5c
1 parent 378781d
commit 34d4d5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/graphic/Fast3D/Fast3dWindow.cpp b/src/graphic/Fast3D/Fast3dWindow.cpp
@@ -311,10 +311,10 @@ void Fast3dWindow::OnFullscreenChanged(bool isNowFullscreen) {
 
     if (isNowFullscreen) {
         auto menuBar = wnd->GetGui()->GetMenuBar();
-        wnd->SetCursorVisibility(menuBar && menuBar->IsVisible() || wnd->ShouldForceCursorVisibility() ||
-                                 CVarGetInteger("gWindows.Menu", 0));
+        wnd->SetMouseCapture(!(menuBar && menuBar->IsVisible() || wnd->ShouldForceCursorVisibility() ||
+                                 CVarGetInteger("gWindows.Menu", 0)));
     } else {
-        wnd->SetCursorVisibility(true);
+        wnd->SetMouseCapture(false);
     }
 }
 } // namespace Fast
diff --git a/src/window/gui/Gui.cpp b/src/window/gui/Gui.cpp
@@ -494,9 +494,8 @@ void Gui::DrawMenu() {
             GetMenuBar()->ToggleVisibility();
         }
         if (wnd->IsFullscreen()) {
-            // TODO: mouse capture?
-            Context::GetInstance()->GetWindow()->SetCursorVisibility(GetMenuOrMenubarVisible() ||
-                                                                     wnd->ShouldForceCursorVisibility());
+            Context::GetInstance()->GetWindow()->SetMouseCapture(!(GetMenuOrMenubarVisible() ||
+                                                                     wnd->ShouldForceCursorVisibility()));
         }
         if (CVarGetInteger(CVAR_IMGUI_CONTROLLER_NAV, 0) && GetMenuOrMenubarVisible()) {
             mImGuiIo->ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
@@ -963,9 +962,9 @@ void Gui::SetMenuBar(std::shared_ptr<GuiMenuBar> menuBar) {
     }
 
     if (Context::GetInstance()->GetWindow()->IsFullscreen()) {
-        Context::GetInstance()->GetWindow()->SetCursorVisibility(
+        Context::GetInstance()->GetWindow()->SetMouseCapture(!(
             (GetMenuBar() && GetMenuBar()->IsVisible()) ||
-            Context::GetInstance()->GetWindow()->ShouldForceCursorVisibility());
+            Context::GetInstance()->GetWindow()->ShouldForceCursorVisibility()));
     }
 }
 
@@ -977,9 +976,9 @@ void Gui::SetMenu(std::shared_ptr<GuiWindow> menu) {
     }
 
     if (Context::GetInstance()->GetWindow()->IsFullscreen()) {
-        Context::GetInstance()->GetWindow()->SetCursorVisibility(
+        Context::GetInstance()->GetWindow()->SetMouseCapture(!(
             (GetMenu() && GetMenu()->IsVisible()) ||
-            Context::GetInstance()->GetWindow()->ShouldForceCursorVisibility());
+            Context::GetInstance()->GetWindow()->ShouldForceCursorVisibility()));
     }
 }