diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index e0e8f4db063a9..b1240ee8f43e2 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -508,16 +508,20 @@ void FullscreenUI::GetStandardSelectionFooterText(SmallStringBase& dest, bool ba const bool circleOK = ImGui::GetIO().ConfigNavSwapGamepadButtons; ImGuiFullscreen::CreateFooterTextString( dest, - std::array{std::make_pair(ICON_PF_DPAD_UP_DOWN, FSUI_VSTR("Change Selection")), + std::array{ + std::make_pair(ICON_PF_DPAD_UP_DOWN, FSUI_VSTR("Change Selection")), std::make_pair(circleOK ? ICON_PF_BUTTON_CIRCLE : ICON_PF_BUTTON_CROSS, FSUI_VSTR("Select")), - std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, back_instead_of_cancel ? FSUI_VSTR("Back") : FSUI_VSTR("Cancel"))}); + std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, back_instead_of_cancel ? FSUI_VSTR("Back") : FSUI_VSTR("Cancel")), + }); } else { ImGuiFullscreen::CreateFooterTextString( - dest, std::array{std::make_pair(ICON_PF_ARROW_UP ICON_PF_ARROW_DOWN, FSUI_VSTR("Change Selection")), + dest, std::array{ + std::make_pair(ICON_PF_ARROW_UP ICON_PF_ARROW_DOWN, FSUI_VSTR("Change Selection")), std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Select")), - std::make_pair(ICON_PF_ESC, back_instead_of_cancel ? FSUI_VSTR("Back") : FSUI_VSTR("Cancel"))}); + std::make_pair(ICON_PF_ESC, back_instead_of_cancel ? FSUI_VSTR("Back") : FSUI_VSTR("Cancel")), + }); } } @@ -539,18 +543,23 @@ void ImGuiFullscreen::GetFileSelectorHelpText(SmallStringBase& dest) { const bool circleOK = ImGui::GetIO().ConfigNavSwapGamepadButtons; ImGuiFullscreen::CreateFooterTextString( - dest, std::array{std::make_pair(ICON_PF_DPAD_UP_DOWN, FSUI_VSTR("Change Selection")), + dest, std::array{ + std::make_pair(ICON_PF_DPAD_UP_DOWN, FSUI_VSTR("Change Selection")), std::make_pair(ICON_PF_BUTTON_TRIANGLE, FSUI_VSTR("Parent Directory")), std::make_pair(circleOK ? ICON_PF_BUTTON_CIRCLE : ICON_PF_BUTTON_CROSS, FSUI_VSTR("Select")), - std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Cancel"))}); + std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Cancel")), + }); } else { ImGuiFullscreen::CreateFooterTextString( dest, - std::array{std::make_pair(ICON_PF_ARROW_UP ICON_PF_ARROW_DOWN, FSUI_VSTR("Change Selection")), + std::array{ + std::make_pair(ICON_PF_ARROW_UP ICON_PF_ARROW_DOWN, FSUI_VSTR("Change Selection")), std::make_pair(ICON_PF_BACKSPACE, FSUI_VSTR("Parent Directory")), - std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Select")), std::make_pair(ICON_PF_ESC, FSUI_VSTR("Cancel"))}); + std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Select")), + std::make_pair(ICON_PF_ESC, FSUI_VSTR("Cancel")), + }); } } @@ -559,15 +568,19 @@ void ImGuiFullscreen::GetInputDialogHelpText(SmallStringBase& dest) if (IsGamepadInputSource()) { const bool circleOK = ImGui::GetIO().ConfigNavSwapGamepadButtons; - CreateFooterTextString(dest, std::array{std::make_pair(ICON_PF_KEYBOARD, FSUI_VSTR("Enter Value")), + CreateFooterTextString(dest, std::array{ + std::make_pair(ICON_PF_KEYBOARD, FSUI_VSTR("Enter Value")), std::make_pair(circleOK ? ICON_PF_BUTTON_CIRCLE : ICON_PF_BUTTON_CROSS, FSUI_VSTR("Select")), - std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Cancel"))}); + std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Cancel")), + }); } else { - CreateFooterTextString(dest, std::array{std::make_pair(ICON_PF_KEYBOARD, FSUI_VSTR("Enter Value")), + CreateFooterTextString(dest, std::array{ + std::make_pair(ICON_PF_KEYBOARD, FSUI_VSTR("Enter Value")), std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Select")), - std::make_pair(ICON_PF_ESC, FSUI_VSTR("Cancel"))}); + std::make_pair(ICON_PF_ESC, FSUI_VSTR("Cancel")), + }); } } @@ -1001,7 +1014,7 @@ bool FullscreenUI::LoadResources() s_fallback_exe_texture = LoadTexture("fullscreenui/applications-system.png"); for (u32 i = static_cast(GameDatabaseSchema::Compatibility::Nothing); - i <= static_cast(GameDatabaseSchema::Compatibility::Perfect); i++) + i <= static_cast(GameDatabaseSchema::Compatibility::Perfect); i++) { s_game_compatibility_textures[i - 1] = LoadTexture(fmt::format("icons/star-{}.png", i - 1).c_str()); } @@ -1385,7 +1398,8 @@ void FullscreenUI::DrawLandingWindow() std::make_pair(ICON_PF_BUTTON_TRIANGLE, FSUI_VSTR("Game List")), std::make_pair(ICON_PF_BUTTON_SQUARE, FSUI_VSTR("Toggle Fullscreen")), std::make_pair(circleOK ? ICON_PF_BUTTON_CIRCLE : ICON_PF_BUTTON_CROSS, FSUI_VSTR("Select")), - std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Exit"))}); + std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Exit")), + }); } else { @@ -1395,7 +1409,8 @@ void FullscreenUI::DrawLandingWindow() std::make_pair(ICON_PF_ARROW_LEFT ICON_PF_ARROW_RIGHT, FSUI_VSTR("Navigate")), std::make_pair(ICON_PF_SPACE, FSUI_VSTR("Game List")), std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Select")), - std::make_pair(ICON_PF_ESC, FSUI_VSTR("Exit"))}); + std::make_pair(ICON_PF_ESC, FSUI_VSTR("Exit")), + }); } } @@ -1450,17 +1465,21 @@ void FullscreenUI::DrawStartGameWindow() if (IsGamepadInputSource()) { const bool circleOK = ImGui::GetIO().ConfigNavSwapGamepadButtons; - SetFullscreenFooterText(std::array{std::make_pair(ICON_PF_DPAD_LEFT_RIGHT, FSUI_VSTR("Navigate")), + SetFullscreenFooterText(std::array{ + std::make_pair(ICON_PF_DPAD_LEFT_RIGHT, FSUI_VSTR("Navigate")), std::make_pair(ICON_PF_BUTTON_SQUARE, FSUI_VSTR("Load Global State")), std::make_pair(circleOK ? ICON_PF_BUTTON_CIRCLE : ICON_PF_BUTTON_CROSS, FSUI_VSTR("Select")), - std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Back"))}); + std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Back")), + }); } else { - SetFullscreenFooterText(std::array{std::make_pair(ICON_PF_ARROW_LEFT ICON_PF_ARROW_RIGHT, FSUI_VSTR("Navigate")), + SetFullscreenFooterText(std::array{ + std::make_pair(ICON_PF_ARROW_LEFT ICON_PF_ARROW_RIGHT, FSUI_VSTR("Navigate")), std::make_pair(ICON_PF_F1, FSUI_VSTR("Load Global State")), std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Select")), - std::make_pair(ICON_PF_ESC, FSUI_VSTR("Back"))}); + std::make_pair(ICON_PF_ESC, FSUI_VSTR("Back")), + }); } } @@ -1506,14 +1525,16 @@ void FullscreenUI::DrawExitWindow() SetFullscreenFooterText(std::array{ std::make_pair(ICON_PF_DPAD_LEFT_RIGHT, FSUI_VSTR("Navigate")), std::make_pair(circleOK ? ICON_PF_BUTTON_CIRCLE : ICON_PF_BUTTON_CROSS, FSUI_VSTR("Select")), - std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Back"))}); + std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Back")), + }); } else { SetFullscreenFooterText(std::array{ std::make_pair(ICON_PF_ARROW_LEFT ICON_PF_ARROW_RIGHT, FSUI_VSTR("Navigate")), std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Select")), - std::make_pair(ICON_PF_ESC, FSUI_VSTR("Back"))}); + std::make_pair(ICON_PF_ESC, FSUI_VSTR("Back")), + }); } } @@ -3086,7 +3107,8 @@ void FullscreenUI::DrawSettingsWindow() std::make_pair(ICON_PF_DPAD_LEFT_RIGHT, FSUI_VSTR("Change Page")), std::make_pair(ICON_PF_DPAD_UP_DOWN, FSUI_VSTR("Navigate")), std::make_pair(circleOK ? ICON_PF_BUTTON_CIRCLE : ICON_PF_BUTTON_CROSS, FSUI_VSTR("Select")), - std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Back"))}); + std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Back")), + }); } else { @@ -3094,7 +3116,8 @@ void FullscreenUI::DrawSettingsWindow() std::make_pair(ICON_PF_ARROW_LEFT ICON_PF_ARROW_RIGHT, FSUI_VSTR("Change Page")), std::make_pair(ICON_PF_ARROW_UP ICON_PF_ARROW_DOWN, FSUI_VSTR("Navigate")), std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Select")), - std::make_pair(ICON_PF_ESC, FSUI_VSTR("Back"))}); + std::make_pair(ICON_PF_ESC, FSUI_VSTR("Back")), + }); } } @@ -4127,7 +4150,8 @@ void FullscreenUI::DrawGraphicsSettingsPage(SettingsInterface* bsi, bool show_ad static constexpr const char* s_gsdump_compression[] = { FSUI_NSTR("Uncompressed"), FSUI_NSTR("LZMA (xz)"), - FSUI_NSTR("Zstandard (zst)")}; + FSUI_NSTR("Zstandard (zst)"), + }; if (show_advanced_settings) { @@ -4917,13 +4941,15 @@ void FullscreenUI::DrawAdvancedSettingsPage() FSUI_NSTR("Uncompressed"), FSUI_NSTR("Deflate64"), FSUI_NSTR("Zstandard"), - FSUI_NSTR("LZMA2")}; + FSUI_NSTR("LZMA2"), + }; static constexpr const char* s_savestate_compression_ratio[] = { FSUI_NSTR("Low (Fast)"), FSUI_NSTR("Medium (Recommended)"), FSUI_NSTR("High"), - FSUI_NSTR("Very High (Slow, Not Recommended)")}; + FSUI_NSTR("Very High (Slow, Not Recommended)"), + }; if (show_advanced_settings) { @@ -5400,15 +5426,19 @@ void FullscreenUI::DrawPauseMenu(MainWindowType type) if (IsGamepadInputSource()) { const bool circleOK = ImGui::GetIO().ConfigNavSwapGamepadButtons; - SetFullscreenFooterText(std::array{std::make_pair(ICON_PF_DPAD_UP_DOWN, FSUI_VSTR("Change Selection")), + SetFullscreenFooterText(std::array{ + std::make_pair(ICON_PF_DPAD_UP_DOWN, FSUI_VSTR("Change Selection")), std::make_pair(circleOK ? ICON_PF_BUTTON_CIRCLE : ICON_PF_BUTTON_CROSS, FSUI_VSTR("Select")), - std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Return To Game"))}); + std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Return To Game")), + }); } else { SetFullscreenFooterText(std::array{ std::make_pair(ICON_PF_ARROW_UP ICON_PF_ARROW_DOWN, FSUI_VSTR("Change Selection")), - std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Select")), std::make_pair(ICON_PF_ESC, FSUI_VSTR("Return To Game"))}); + std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Select")), + std::make_pair(ICON_PF_ESC, FSUI_VSTR("Return To Game")), + }); } } @@ -5838,14 +5868,17 @@ void FullscreenUI::DrawSaveStateSelector(bool is_loading) std::make_pair(ICON_PF_DPAD, FSUI_VSTR("Select State")), std::make_pair(ICON_PF_BUTTON_SQUARE, FSUI_VSTR("Options")), std::make_pair(circleOK ? ICON_PF_BUTTON_CIRCLE : ICON_PF_BUTTON_CROSS, FSUI_VSTR("Load/Save State")), - std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Cancel"))}); + std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Cancel")), + }); } else { SetFullscreenFooterText(std::array{ std::make_pair(ICON_PF_ARROW_UP ICON_PF_ARROW_DOWN ICON_PF_ARROW_LEFT ICON_PF_ARROW_RIGHT, FSUI_VSTR("Select State")), - std::make_pair(ICON_PF_F1, FSUI_VSTR("Options")), std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Load/Save State")), - std::make_pair(ICON_PF_ESC, FSUI_VSTR("Cancel"))}); + std::make_pair(ICON_PF_F1, FSUI_VSTR("Options")), + std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Load/Save State")), + std::make_pair(ICON_PF_ESC, FSUI_VSTR("Cancel")), + }); } } } @@ -6136,15 +6169,19 @@ void FullscreenUI::DrawGameListWindow() std::make_pair(ICON_PF_BUTTON_TRIANGLE, FSUI_VSTR("Change View")), std::make_pair(ICON_PF_BUTTON_SQUARE, FSUI_VSTR("Launch Options")), std::make_pair(circleOK ? ICON_PF_BUTTON_CIRCLE : ICON_PF_BUTTON_CROSS, FSUI_VSTR("Start Game")), - std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Back"))}); + std::make_pair(circleOK ? ICON_PF_BUTTON_CROSS : ICON_PF_BUTTON_CIRCLE, FSUI_VSTR("Back")), + }); } else { SetFullscreenFooterText(std::array{ std::make_pair(ICON_PF_ARROW_UP ICON_PF_ARROW_DOWN ICON_PF_ARROW_LEFT ICON_PF_ARROW_RIGHT, FSUI_VSTR("Select Game")), - std::make_pair(ICON_PF_F1, FSUI_VSTR("Change View")), std::make_pair(ICON_PF_F2, FSUI_VSTR("Settings")), - std::make_pair(ICON_PF_F3, FSUI_VSTR("Launch Options")), std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Start Game")), - std::make_pair(ICON_PF_ESC, FSUI_VSTR("Back"))}); + std::make_pair(ICON_PF_F1, FSUI_VSTR("Change View")), + std::make_pair(ICON_PF_F2, FSUI_VSTR("Settings")), + std::make_pair(ICON_PF_F3, FSUI_VSTR("Launch Options")), + std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Start Game")), + std::make_pair(ICON_PF_ESC, FSUI_VSTR("Back")), + }); } }