lee/OptiScaler
1
0
Fork 0
mirror of https://github.com/optiscaler/OptiScaler.git synced 2026-09-24 22:35:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed fps overlay and gamepad/keyboard inputs issue

Browse Source
This commit is contained in:
cdozdil
2025-01-11 11:49:19 +03:00
parent ed45d67f69
commit 1a4e79770f
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/imgui/imgui_common.cpp
+16 -4
View File
@@ -388,7 +388,7 @@ LRESULT ImGuiCommon::WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
return TRUE;
}
// SHUFT + DEL - Debug dump
// SHIFT + DEL - Debug dump
if (msg == WM_KEYDOWN && wParam == VK_DELETE && (GetKeyState(VK_SHIFT) & 0x8000))
{
Config::Instance()->xessDebug = true;
@@ -765,7 +765,7 @@ bool ImGuiCommon::RenderMenu()
if (!_isInited)
return false;
ImGuiIO const& io = ImGui::GetIO(); (void)io;
ImGuiIO& io = ImGui::GetIO(); (void)io;
if (!Config::Instance()->MenuScale.has_value())
{
@@ -929,13 +929,26 @@ bool ImGuiCommon::RenderMenu()
overlayPosition.y = io.DisplaySize.y - winSize.y;
if (!_isVisible)
{
if ((io.ConfigFlags & ImGuiConfigFlags_NavNoCaptureKeyboard) == 0)
io.ConfigFlags = ImGuiConfigFlags_NavNoCaptureKeyboard | ImGuiConfigFlags_NoMouse | ImGuiConfigFlags_NoMouseCursorChange | ImGuiConfigFlags_NoKeyboard;
return true;
}
}
if (!_isVisible)
{
if ((io.ConfigFlags & ImGuiConfigFlags_NavNoCaptureKeyboard) == 0)
io.ConfigFlags = ImGuiConfigFlags_NavNoCaptureKeyboard | ImGuiConfigFlags_NoMouse | ImGuiConfigFlags_NoMouseCursorChange | ImGuiConfigFlags_NoKeyboard;
return false;
}
{
if ((io.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) == 0)
io.ConfigFlags = ImGuiConfigFlags_NavEnableKeyboard | ImGuiConfigFlags_NavEnableGamepad;
ImGuiWindowFlags flags = 0;
flags |= ImGuiWindowFlags_NoSavedSettings;
flags |= ImGuiWindowFlags_NoCollapse;
@@ -2736,8 +2749,7 @@ void ImGuiCommon::Init(HWND InHwnd)
ImGui::StyleColorsDark();
ImGuiIO& io = ImGui::GetIO(); (void)io;
io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
io.ConfigFlags = ImGuiConfigFlags_NavEnableKeyboard | ImGuiConfigFlags_NavEnableGamepad;
io.MouseDrawCursor = _isVisible;
io.WantCaptureKeyboard = _isVisible;