From e273820ce2488b360d03c220c8d9f02f6b3766fc Mon Sep 17 00:00:00 2001 From: 72374 <250991390+72374@users.noreply.github.com> Date: Sat, 28 Mar 2026 22:23:43 +0100 Subject: [PATCH 1/4] Move "Fullscreen"- and "Full window render"-settings to "Configuration" from "Debug" > "Rendering". These settings are not specific to debugging, and quite useful when playing games. --- src/gui/gui.cc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/gui/gui.cc b/src/gui/gui.cc index 189a5ff62..bf0db1f5c 100644 --- a/src/gui/gui.cc +++ b/src/gui/gui.cc @@ -1324,6 +1324,16 @@ void PCSX::GUI::endFrame() { } ImGui::Separator(); if (ImGui::BeginMenu(_("Configuration"))) { + if (ImGui::MenuItem(_("Fullscreen"), nullptr, &m_fullscreen)) { + setFullscreen(m_fullscreen); + m_setupScreenSize = true; + } + if (ImGui::MenuItem(_("Full window render"), nullptr, &m_fullWindowRender)) { + m_setupScreenSize = true; + // full window render mode can't have anything docked in the dockspace + ImGui::DockContextClearNodes(context, dockspaceId, true); + } + ImGui::Separator(); ImGui::MenuItem(_("Emulation"), nullptr, &m_showCfg); if (ImGui::MenuItem(_("Manage Memory Cards"), nullptr, &m_memcardManager.m_show)) { m_memcardManager.m_frameCount = 0; // Reset frame count when memcard manager is toggled @@ -1465,15 +1475,6 @@ in Configuration->Emulation, restart PCSX-Redux, then try again.)")); ImGui::EndMenu(); } if (ImGui::BeginMenu(_("Rendering"))) { - if (ImGui::MenuItem(_("Full window render"), nullptr, &m_fullWindowRender)) { - m_setupScreenSize = true; - // full window render mode can't have anything docked in the dockspace - ImGui::DockContextClearNodes(context, dockspaceId, true); - } - if (ImGui::MenuItem(_("Fullscreen"), nullptr, &m_fullscreen)) { - setFullscreen(m_fullscreen); - m_setupScreenSize = true; - } ImGui::MenuItem(_("Show Output Shader Editor"), nullptr, &m_outputShaderEditor.m_show); ImGui::MenuItem(_("Show Offscreen Shader Editor"), nullptr, &m_offscreenShaderEditor.m_show); if (ImGui::MenuItem(_("Reset shaders"), nullptr)) { @@ -2892,4 +2893,4 @@ void PCSX::GUI::changeScale(float scale) { m_currentScale = scale; m_allScales.emplace(scale); ImGui::SetCurrentFont(getMainFont()); -} \ No newline at end of file +} From 18b9c18ee868f64812a936d4f7062f8ffdd471ba Mon Sep 17 00:00:00 2001 From: 72374 <250991390+72374@users.noreply.github.com> Date: Sat, 28 Mar 2026 22:49:08 +0100 Subject: [PATCH 2/4] Separate the shader-settings in "Configuration" This makes it easier to understand that these settings are related. --- src/gui/gui.cc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/gui/gui.cc b/src/gui/gui.cc index bf0db1f5c..f04fee4be 100644 --- a/src/gui/gui.cc +++ b/src/gui/gui.cc @@ -1334,15 +1334,6 @@ void PCSX::GUI::endFrame() { ImGui::DockContextClearNodes(context, dockspaceId, true); } ImGui::Separator(); - ImGui::MenuItem(_("Emulation"), nullptr, &m_showCfg); - if (ImGui::MenuItem(_("Manage Memory Cards"), nullptr, &m_memcardManager.m_show)) { - m_memcardManager.m_frameCount = 0; // Reset frame count when memcard manager is toggled - } - ImGui::MenuItem(_("GPU"), nullptr, &PCSX::g_emulator->m_gpu->m_showCfg); - ImGui::MenuItem(_("SPU"), nullptr, &PCSX::g_emulator->m_spu->m_showCfg); - ImGui::MenuItem(_("UI"), nullptr, &m_showUiCfg); - ImGui::MenuItem(_("System"), nullptr, &m_showSysCfg); - ImGui::MenuItem(_("Controls"), nullptr, &g_emulator->m_pads->m_showCfg); if (ImGui::BeginMenu(_("Shader presets"))) { if (ImGui::MenuItem(_("Default shader"))) { setDefaultShaders(); @@ -1378,6 +1369,16 @@ void PCSX::GUI::endFrame() { m_offscreenShaderEditor.setConfigure(); m_outputShaderEditor.setConfigure(); } + ImGui::Separator(); + ImGui::MenuItem(_("Emulation"), nullptr, &m_showCfg); + if (ImGui::MenuItem(_("Manage Memory Cards"), nullptr, &m_memcardManager.m_show)) { + m_memcardManager.m_frameCount = 0; // Reset frame count when memcard manager is toggled + } + ImGui::MenuItem(_("GPU"), nullptr, &PCSX::g_emulator->m_gpu->m_showCfg); + ImGui::MenuItem(_("SPU"), nullptr, &PCSX::g_emulator->m_spu->m_showCfg); + ImGui::MenuItem(_("UI"), nullptr, &m_showUiCfg); + ImGui::MenuItem(_("System"), nullptr, &m_showSysCfg); + ImGui::MenuItem(_("Controls"), nullptr, &g_emulator->m_pads->m_showCfg); ImGui::MenuItem(_("PIO Cartridge"), nullptr, &m_pioCart.m_show); ImGui::EndMenu(); } From 93296ce1afb182bee54baafe29f3ce38bce01e49 Mon Sep 17 00:00:00 2001 From: 72374 <250991390+72374@users.noreply.github.com> Date: Sat, 28 Mar 2026 22:59:19 +0100 Subject: [PATCH 3/4] Separate "Controller"- and "Memory Card"-settings in "Configuration" These settings are about the hardware that one would normally interact with, when playing with the actual console-game-system: Controllers for playing games, and Memory Cards for managing save-states. --- src/gui/gui.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/gui.cc b/src/gui/gui.cc index f04fee4be..e968501c0 100644 --- a/src/gui/gui.cc +++ b/src/gui/gui.cc @@ -1370,15 +1370,16 @@ void PCSX::GUI::endFrame() { m_outputShaderEditor.setConfigure(); } ImGui::Separator(); - ImGui::MenuItem(_("Emulation"), nullptr, &m_showCfg); + ImGui::MenuItem(_("Controls"), nullptr, &g_emulator->m_pads->m_showCfg); if (ImGui::MenuItem(_("Manage Memory Cards"), nullptr, &m_memcardManager.m_show)) { m_memcardManager.m_frameCount = 0; // Reset frame count when memcard manager is toggled } + ImGui::Separator(); + ImGui::MenuItem(_("Emulation"), nullptr, &m_showCfg); ImGui::MenuItem(_("GPU"), nullptr, &PCSX::g_emulator->m_gpu->m_showCfg); ImGui::MenuItem(_("SPU"), nullptr, &PCSX::g_emulator->m_spu->m_showCfg); ImGui::MenuItem(_("UI"), nullptr, &m_showUiCfg); ImGui::MenuItem(_("System"), nullptr, &m_showSysCfg); - ImGui::MenuItem(_("Controls"), nullptr, &g_emulator->m_pads->m_showCfg); ImGui::MenuItem(_("PIO Cartridge"), nullptr, &m_pioCart.m_show); ImGui::EndMenu(); } From ac457d59fdc8aca1e7e8123649d7e185c1e5090d Mon Sep 17 00:00:00 2001 From: 72374 <250991390+72374@users.noreply.github.com> Date: Sat, 28 Mar 2026 23:19:41 +0100 Subject: [PATCH 4/4] Separate "UI"- and "System"-settings in "Configuration" These mostly relate to the emulator itself. --- src/gui/gui.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/gui.cc b/src/gui/gui.cc index e968501c0..8f3de02d2 100644 --- a/src/gui/gui.cc +++ b/src/gui/gui.cc @@ -1378,9 +1378,10 @@ void PCSX::GUI::endFrame() { ImGui::MenuItem(_("Emulation"), nullptr, &m_showCfg); ImGui::MenuItem(_("GPU"), nullptr, &PCSX::g_emulator->m_gpu->m_showCfg); ImGui::MenuItem(_("SPU"), nullptr, &PCSX::g_emulator->m_spu->m_showCfg); + ImGui::MenuItem(_("PIO Cartridge"), nullptr, &m_pioCart.m_show); + ImGui::Separator(); ImGui::MenuItem(_("UI"), nullptr, &m_showUiCfg); ImGui::MenuItem(_("System"), nullptr, &m_showSysCfg); - ImGui::MenuItem(_("PIO Cartridge"), nullptr, &m_pioCart.m_show); ImGui::EndMenu(); } ImGui::Separator();