From da677682cd51b921f536a74ef38fb61027aaa52a Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Sun, 25 Sep 2022 11:14:46 -0500 Subject: [PATCH] Don't disable keyboard when menuBar is shown and gControlNav is true (#1566) --- libultraship/libultraship/ImGuiImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libultraship/libultraship/ImGuiImpl.cpp b/libultraship/libultraship/ImGuiImpl.cpp index 4883f5a0e..2e421e1d4 100644 --- a/libultraship/libultraship/ImGuiImpl.cpp +++ b/libultraship/libultraship/ImGuiImpl.cpp @@ -363,7 +363,7 @@ namespace SohImGui { } if (CVar_GetS32("gControlNav", 0) && CVar_GetS32("gOpenMenuBar", 0)) { - io->ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad | ImGuiConfigFlags_NavEnableKeyboard; + io->ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad; } else { io->ConfigFlags &= ~ImGuiConfigFlags_NavEnableGamepad; } @@ -466,7 +466,7 @@ namespace SohImGui { ShowCursor(menu_bar, Dialogues::dMenubar); Window::GetInstance()->GetControlDeck()->SaveControllerSettings(); if (CVar_GetS32("gControlNav", 0) && CVar_GetS32("gOpenMenuBar", 0)) { - io->ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad | ImGuiConfigFlags_NavEnableKeyboard; + io->ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad; } else { io->ConfigFlags &= ~ImGuiConfigFlags_NavEnableGamepad; }