muskit/spice2x.github.io
0
0
Fork 0
mirror of https://github.com/spice2x/spice2x.github.io.git synced 2026-08-01 22:30:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

overlay: fix cursor visibility (#766)

Browse Source 
After #739 there was a regression where the cursor visibility became
inconsistent if the FPS display was shown and then another overlay
window was toggled. Fix the imgui cursor toggle logic to only check for
the overlay layer visibility.
This commit is contained in:
bicarus
2026-06-17 20:12:56 -07:00
committed by GitHub
parent 50fc80a1c3
commit eb897d0f1b
1 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spice2x/overlay/imgui/impl_spice.cpp
+48 -16
View File
@@ -352,6 +352,52 @@ static void ImGui_ImplSpice_UpdateMousePos() {
} }
} }
// Decide whether ImGui should draw its software cursor this frame. Kept out of
// ImGui_ImplSpice_NewFrame so the visibility rules live in one place.
//
// Only matters when ImGui owns cursor drawing (g_MouseCursorAutoHide, i.e. the
// game hid the OS cursor); otherwise the OS draws the cursor and
// io.MouseDrawCursor stays false throughout. In that mode:
// - overlay hidden -> never draw the cursor (input belongs to the game)
// - overlay shown -> visible immediately, auto-hide after 2s idle, reappear
// on any mouse movement / wheel / button
static void ImGui_ImplSpice_UpdateCursorVisibility(
bool overlay_visible,
const ImVec2 &old_mouse_pos,
const ImVec2 &new_mouse_pos,
long wheel_diff)
{
if (!g_MouseCursorAutoHide) {
return;
}
auto &io = ImGui::GetIO();
static bool overlay_visible_old = false;
const bool mouse_activity =
old_mouse_pos.x != new_mouse_pos.x ||
old_mouse_pos.y != new_mouse_pos.y ||
wheel_diff != 0 ||
g_MouseDown[ImGuiMouseButton_Left] ||
g_MouseDown[ImGuiMouseButton_Right] ||
g_MouseDown[ImGuiMouseButton_Middle];
if (!overlay_visible) {
// overlay hidden: the game owns the cursor, don't draw ImGui's
io.MouseDrawCursor = false;
} else if (!overlay_visible_old || mouse_activity) {
// overlay just opened, or the mouse moved: show the cursor and
// (re)start the idle timer
g_LastMouseMovement = get_performance_milliseconds();
io.MouseDrawCursor = true;
} else if ((get_performance_milliseconds() - g_LastMouseMovement) > 2000) {
// mouse idle for more than 2 seconds while the overlay is open: hide it
io.MouseDrawCursor = false;
}
overlay_visible_old = overlay_visible;
}
void ImGui_ImplSpice_NewFrame() { void ImGui_ImplSpice_NewFrame() {
// check if font is built // check if font is built
@@ -527,22 +573,8 @@ void ImGui_ImplSpice_NewFrame() {
} }
} }
// automatically hide cursor // mouse cursor: visibility (overlay visibility + auto-hide)
if (g_MouseCursorAutoHide) { ImGui_ImplSpice_UpdateCursorVisibility(overlay_visible, old_mouse_pos, new_mouse_pos, wheel_diff);
if (old_mouse_pos.x != new_mouse_pos.x ||
old_mouse_pos.y != new_mouse_pos.y ||
wheel_diff != 0 ||
g_MouseDown[ImGuiMouseButton_Left] || g_MouseDown[ImGuiMouseButton_Right] || g_MouseDown[ImGuiMouseButton_Middle]) {
// mouse moved, update time and show the cursor
g_LastMouseMovement = get_performance_milliseconds();
io.MouseDrawCursor = true;
} else if ((get_performance_milliseconds() - g_LastMouseMovement) > 2000) {
// mouse idle for more than 2 seconds, hide the cursor
io.MouseDrawCursor = false;
}
}
if (cfg::CONFIGURATOR_STANDALONE) { if (cfg::CONFIGURATOR_STANDALONE) {
// if cursor is inside the client area, always set the OS cursor to what ImGui wants // if cursor is inside the client area, always set the OS cursor to what ImGui wants