Merge pull request #93 from patchzyy/Remove-f10-controller-block

Remove the f10 menu blocking controller inputs
This commit is contained in:
patchzyy authored and GitHub committed 2026-08-30 11:35:31 +02:00
commit 6c1d4faaf7
1 file changed
+3 -5
+3 -5
View File
@@ -270,7 +270,6 @@ void SetTopBarVisible(bool visible) {
return; return;
} }
g_topBarVisible = visible; g_topBarVisible = visible;
PADBlockInput(visible);
} }
void ApplyConfiguredMappings() { void ApplyConfiguredMappings() {
@@ -957,7 +956,7 @@ void InitializeRuntimeSettings() noexcept {
aurora_set_skip_unready_pipelines(g_skipUnreadyPipelines); aurora_set_skip_unready_pipelines(g_skipUnreadyPipelines);
g_strapInputAccepted.store(false, std::memory_order_relaxed); g_strapInputAccepted.store(false, std::memory_order_relaxed);
g_startupDismissFrame.store(UINT64_MAX, std::memory_order_relaxed); g_startupDismissFrame.store(UINT64_MAX, std::memory_order_relaxed);
PADBlockInput(g_topBarVisible); PADBlockInput(false);
} }
void HandleEvents(const AuroraEvent* events) noexcept { void HandleEvents(const AuroraEvent* events) noexcept {
@@ -994,9 +993,8 @@ void Draw() noexcept {
DrawFpsOverlay(); DrawFpsOverlay();
DrawTopBar(); DrawTopBar();
controller_mapping_wizard::Draw(); controller_mapping_wizard::Draw();
// The wizard captures raw presses; keep them out of the game even when the // The wizard captures raw presses; keep them out of the game.
// top bar is hidden mid-setup. PADBlockInput(controller_mapping_wizard::IsActive());
PADBlockInput(g_topBarVisible || controller_mapping_wizard::IsActive());
DrawStartupScreen(); DrawStartupScreen();
} }