Don't full-screen-on-doubleclick if ImGui debugger is active

This commit is contained in:
Henrik Rydgård 2024-11-12 11:30:01 +01:00
parent 39a07a033c
commit 18240b3ed0

View File

@ -641,20 +641,20 @@ namespace MainWindow
SetCapture(hWnd); SetCapture(hWnd);
// Simulate doubleclick, doesn't work with RawInput enabled // Simulate doubleclick, doesn't work with RawInput enabled
static double lastMouseDown; static double lastMouseDownTime;
static float lastMouseDownX = -1.0f; static float lastMouseDownX = -1.0f;
static float lastMouseDownY = -1.0f; static float lastMouseDownY = -1.0f;
double now = time_now_d(); const double now = time_now_d();
if ((now - lastMouseDown) < 0.001 * GetDoubleClickTime()) { if ((now - lastMouseDownTime) < 0.001 * GetDoubleClickTime()) {
float dx = lastMouseDownX - x; const float dx = lastMouseDownX - x;
float dy = lastMouseDownY - y; const float dy = lastMouseDownY - y;
float distSq = dx * dx + dy * dy; const float distSq = dx * dx + dy * dy;
if (distSq < 3.0f*3.0f && !g_Config.bShowTouchControls && !g_Config.bMouseControl && GetUIState() == UISTATE_INGAME && g_Config.bFullscreenOnDoubleclick) { if (distSq < 3.0f*3.0f && !g_Config.bShowTouchControls && !g_Config.bShowImDebugger && !g_Config.bMouseControl && GetUIState() == UISTATE_INGAME && g_Config.bFullscreenOnDoubleclick) {
SendToggleFullscreen(!g_Config.UseFullScreen()); SendToggleFullscreen(!g_Config.UseFullScreen());
} }
lastMouseDown = 0.0; lastMouseDownTime = 0.0;
} else { } else {
lastMouseDown = now; lastMouseDownTime = now;
} }
lastMouseDownX = x; lastMouseDownX = x;
lastMouseDownY = y; lastMouseDownY = y;