Skip to content

Rearrange the "Configuration"-menu #1994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
72374 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Rearrange the "Configuration"-menu #1994

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e273820
Move "Fullscreen"- and "Full window render"-settings to "Configuration"
72374 Mar 28, 2026
18b9c18
Separate the shader-settings in "Configuration"
72374 Mar 28, 2026
93296ce
Separate "Controller"- and "Memory Card"-settings in "Configuration"
72374 Mar 28, 2026
ac457d5
Separate "UI"- and "System"-settings in "Configuration"
72374 Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions src/gui/gui.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1324,15 +1324,16 @@ void PCSX::GUI::endFrame() {
}
ImGui::Separator();
if (ImGui::BeginMenu(_("Configuration"))) {
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
if (ImGui::MenuItem(_("Fullscreen"), nullptr, &m_fullscreen)) {
setFullscreen(m_fullscreen);
m_setupScreenSize = true;
}
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::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();
if (ImGui::BeginMenu(_("Shader presets"))) {
if (ImGui::MenuItem(_("Default shader"))) {
setDefaultShaders();
Expand Down Expand Up @@ -1368,7 +1369,19 @@ void PCSX::GUI::endFrame() {
m_offscreenShaderEditor.setConfigure();
m_outputShaderEditor.setConfigure();
}
ImGui::Separator();
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(_("PIO Cartridge"), nullptr, &m_pioCart.m_show);
ImGui::Separator();
ImGui::MenuItem(_("UI"), nullptr, &m_showUiCfg);
ImGui::MenuItem(_("System"), nullptr, &m_showSysCfg);
ImGui::EndMenu();
}
ImGui::Separator();
Expand Down Expand Up @@ -1465,15 +1478,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)) {
Expand Down Expand Up @@ -2892,4 +2896,4 @@ void PCSX::GUI::changeScale(float scale) {
m_currentScale = scale;
m_allScales.emplace(scale);
ImGui::SetCurrentFont(getMainFont());
}
}
Loading