diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp index 33a455385..d7abbc419 100644 --- a/src/core/fullscreen_ui.cpp +++ b/src/core/fullscreen_ui.cpp @@ -164,7 +164,6 @@ enum class MainWindowType : u8 StartGame, Exit, GameList, - GameListSettings, Settings, PauseMenu, Achievements, @@ -182,6 +181,7 @@ enum class SettingsPage : u8 { Summary, Interface, + GameList, Console, Emulation, BIOS, @@ -444,7 +444,7 @@ static void DrawGameGrid(const ImVec2& heading_size); static void HandleGameListActivate(const GameList::Entry* entry); static void HandleGameListOptions(const GameList::Entry* entry); static void HandleSelectDiscForDiscSet(std::string_view disc_set_name); -static void DrawGameListSettingsWindow(); +static void DrawGameListSettingsPage(); static void SwitchToGameList(); static void PopulateGameListEntryList(); static GPUTexture* GetTextureForGameListEntryType(GameList::EntryType type); @@ -971,9 +971,6 @@ void FullscreenUI::Render() case MainWindowType::GameList: DrawGameListWindow(); break; - case MainWindowType::GameListSettings: - DrawGameListSettingsWindow(); - break; case MainWindowType::Settings: DrawSettingsWindow(); break; @@ -3423,9 +3420,10 @@ void FullscreenUI::DrawSettingsWindow() static constexpr float ITEM_WIDTH = 25.0f; static constexpr const SettingsPage global_pages[] = { - SettingsPage::Interface, SettingsPage::Console, SettingsPage::Emulation, SettingsPage::BIOS, - SettingsPage::Graphics, SettingsPage::PostProcessing, SettingsPage::Audio, SettingsPage::Controller, - SettingsPage::Hotkey, SettingsPage::MemoryCards, SettingsPage::Achievements, SettingsPage::Advanced}; + SettingsPage::Interface, SettingsPage::GameList, SettingsPage::Console, SettingsPage::Emulation, + SettingsPage::BIOS, SettingsPage::Graphics, SettingsPage::PostProcessing, SettingsPage::Audio, + SettingsPage::Controller, SettingsPage::Hotkey, SettingsPage::MemoryCards, SettingsPage::Achievements, + SettingsPage::Advanced}; static constexpr const SettingsPage per_game_pages[] = { SettingsPage::Summary, SettingsPage::Console, SettingsPage::Emulation, SettingsPage::Patches, SettingsPage::Cheats, SettingsPage::Graphics, SettingsPage::Audio, SettingsPage::Controller, @@ -3433,6 +3431,7 @@ void FullscreenUI::DrawSettingsWindow() static constexpr std::array, static_cast(SettingsPage::Count)> titles = { {{FSUI_NSTR("Summary"), ICON_FA_FILE_ALT}, {FSUI_NSTR("Interface Settings"), ICON_FA_TV}, + {FSUI_NSTR("Game List Settings"), ICON_FA_LIST_ALT}, {FSUI_NSTR("Console Settings"), ICON_FA_DICE_D20}, {FSUI_NSTR("Emulation Settings"), ICON_FA_COGS}, {FSUI_NSTR("BIOS Settings"), ICON_PF_MICROCHIP}, @@ -3538,6 +3537,10 @@ void FullscreenUI::DrawSettingsWindow() DrawInterfaceSettingsPage(); break; + case SettingsPage::GameList: + DrawGameListSettingsPage(); + break; + case SettingsPage::BIOS: DrawBIOSSettingsPage(); break; @@ -7435,14 +7438,14 @@ void FullscreenUI::DrawGameListWindow() EndFullscreenWindow(); - if (ImGui::IsKeyPressed(ImGuiKey_NavGamepadMenu, false) || ImGui::IsKeyPressed(ImGuiKey_F1, false)) + if (!AreAnyDialogsOpen()) { - s_state.game_list_view = (s_state.game_list_view == GameListView::Grid) ? GameListView::List : GameListView::Grid; - } - else if (ImGui::IsKeyPressed(ImGuiKey_GamepadStart, false) || ImGui::IsKeyPressed(ImGuiKey_F2)) - { - s_state.current_main_window = MainWindowType::GameListSettings; - QueueResetFocus(FocusResetType::ViewChanged); + if (ImGui::IsKeyPressed(ImGuiKey_NavGamepadMenu, false) || ImGui::IsKeyPressed(ImGuiKey_F4, false)) + s_state.game_list_view = (s_state.game_list_view == GameListView::Grid) ? GameListView::List : GameListView::Grid; + else if (ImGui::IsKeyPressed(ImGuiKey_GamepadBack, false) || ImGui::IsKeyPressed(ImGuiKey_F2, false)) + SwitchToSettings(); + else if (ImGui::IsKeyPressed(ImGuiKey_GamepadStart, false) || ImGui::IsKeyPressed(ImGuiKey_F3, false)) + DoResume(); } switch (s_state.game_list_view) @@ -7460,8 +7463,9 @@ void FullscreenUI::DrawGameListWindow() if (IsGamepadInputSource()) { SetFullscreenFooterText(std::array{std::make_pair(ICON_PF_XBOX_DPAD, FSUI_VSTR("Select Game")), + std::make_pair(ICON_PF_BURGER_MENU, FSUI_VSTR("Resume Last Session")), + std::make_pair(ICON_PF_SHARE_CAPTURE, FSUI_VSTR("Settings")), std::make_pair(ICON_PF_BUTTON_X, FSUI_VSTR("Change View")), - std::make_pair(ICON_PF_BURGER_MENU, FSUI_VSTR("Settings")), std::make_pair(ICON_PF_BUTTON_Y, FSUI_VSTR("Launch Options")), std::make_pair(ICON_PF_BUTTON_A, FSUI_VSTR("Start Game")), std::make_pair(ICON_PF_BUTTON_B, FSUI_VSTR("Back"))}, @@ -7473,9 +7477,13 @@ void FullscreenUI::DrawGameListWindow() 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_F3, FSUI_VSTR("Resume Last Session")), + std::make_pair(ICON_PF_F2, FSUI_VSTR("Settings")), + std::make_pair(ICON_PF_F4, FSUI_VSTR("Change View")), + std::make_pair(ICON_PF_F1, FSUI_VSTR("Launch Options")), + std::make_pair(ICON_PF_ENTER, FSUI_VSTR("Start Game")), + std::make_pair(ICON_PF_ESC, FSUI_VSTR("Back")), + }, GetBackgroundAlpha()); } } @@ -7566,7 +7574,7 @@ void FullscreenUI::DrawGameList(const ImVec2& heading_size) if (selected_entry && (ImGui::IsItemClicked(ImGuiMouseButton_Right) || ImGui::IsKeyPressed(ImGuiKey_NavGamepadInput, false) || - ImGui::IsKeyPressed(ImGuiKey_F3, false))) + ImGui::IsKeyPressed(ImGuiKey_F1, false))) { CancelPendingMenuClose(); HandleGameListOptions(selected_entry); @@ -7828,7 +7836,7 @@ void FullscreenUI::DrawGameGrid(const ImVec2& heading_size) } else if (hovered && (ImGui::IsItemClicked(ImGuiMouseButton_Right) || ImGui::IsKeyPressed(ImGuiKey_NavGamepadInput, false) || - ImGui::IsKeyPressed(ImGuiKey_F3, false))) + ImGui::IsKeyPressed(ImGuiKey_F1, false))) { CancelPendingMenuClose(); HandleGameListOptions(entry); @@ -7984,51 +7992,49 @@ void FullscreenUI::HandleSelectDiscForDiscSet(std::string_view disc_set_name) }); } -void FullscreenUI::DrawGameListSettingsWindow() +void FullscreenUI::DrawGameListSettingsPage() { - ImGuiIO& io = ImGui::GetIO(); - const ImVec2 heading_size = - ImVec2(io.DisplaySize.x, LayoutScale(LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY) + - (LayoutScale(LAYOUT_MENU_BUTTON_Y_PADDING) * 2.0f) + LayoutScale(2.0f)); - - if (BeginFullscreenWindow(ImVec2(0.0f, 0.0f), heading_size, "gamelist_view", - MulAlpha(UIStyle.PrimaryColor, GetBackgroundAlpha()))) - { - BeginNavBar(); - - if (NavButton(ICON_PF_NAVIGATION_BACK, true, true)) - { - s_state.current_main_window = MainWindowType::GameList; - QueueResetFocus(FocusResetType::Other); - } - - NavTitle(FSUI_CSTR("Game List Settings")); - EndNavBar(); - } - - EndFullscreenWindow(); - - if (!BeginFullscreenWindow( - ImVec2(0.0f, heading_size.y), - ImVec2(io.DisplaySize.x, io.DisplaySize.y - heading_size.y - LayoutScale(LAYOUT_FOOTER_HEIGHT)), - "settings_parent", MulAlpha(UIStyle.PrimaryColor, GetBackgroundAlpha()), 0.0f, - ImVec2(ImGuiFullscreen::LAYOUT_MENU_WINDOW_X_PADDING, 0.0f))) - { - EndFullscreenWindow(); - return; - } - - if (ImGui::IsWindowFocused() && WantsToCloseMenu()) - { - s_state.current_main_window = MainWindowType::GameList; - QueueResetFocus(FocusResetType::ViewChanged); - } - - auto lock = Host::GetSettingsLock(); SettingsInterface* bsi = GetEditingSettingsInterface(false); BeginMenuButtons(); + MenuHeading(FSUI_CSTR("List Settings")); + { + static constexpr const char* view_types[] = {FSUI_NSTR("Game Grid"), FSUI_NSTR("Game List")}; + static constexpr const char* sort_types[] = { + FSUI_NSTR("Type"), + FSUI_NSTR("Serial"), + FSUI_NSTR("Title"), + FSUI_NSTR("File Title"), + FSUI_NSTR("Time Played"), + FSUI_NSTR("Last Played"), + FSUI_NSTR("File Size"), + FSUI_NSTR("Uncompressed Size"), + FSUI_NSTR("Achievement Unlock/Count"), + }; + + DrawIntListSetting(bsi, FSUI_ICONSTR(ICON_FA_BORDER_ALL, "Default View"), + FSUI_CSTR("Selects the view that the game list will open to."), "Main", + "DefaultFullscreenUIGameView", 0, view_types); + DrawIntListSetting(bsi, FSUI_ICONSTR(ICON_FA_SORT, "Sort By"), + FSUI_CSTR("Determines that field that the game list will be sorted by."), "Main", + "FullscreenUIGameSort", 0, sort_types); + DrawToggleSetting( + bsi, FSUI_ICONSTR(ICON_FA_SORT_ALPHA_DOWN, "Sort Reversed"), + FSUI_CSTR("Reverses the game list sort order from the default (usually ascending to descending)."), "Main", + "FullscreenUIGameSortReverse", false); + DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_LIST, "Merge Multi-Disc Games"), + FSUI_CSTR("Merges multi-disc games into one item in the game list."), "Main", + "FullscreenUIMergeDiscSets", true); + if (DrawToggleSetting( + bsi, FSUI_ICONSTR(ICON_FA_TROPHY, "Show Achievement Trophy Icons"), + FSUI_CSTR("Shows trophy icons in game grid when games have achievements or have been mastered."), "Main", + "FullscreenUIShowTrophyIcons", true)) + { + s_state.game_list_show_trophy_icons = bsi->GetBoolValue("Main", "FullscreenUIShowTrophyIcons", true); + } + } + MenuHeading(FSUI_CSTR("Search Directories")); if (MenuButton(FSUI_ICONSTR(ICON_FA_FOLDER_PLUS, "Add Search Directory"), FSUI_CSTR("Adds a new directory to the game search list."))) @@ -8107,43 +8113,6 @@ void FullscreenUI::DrawGameListSettingsWindow() } } - MenuHeading(FSUI_CSTR("List Settings")); - { - static constexpr const char* view_types[] = {FSUI_NSTR("Game Grid"), FSUI_NSTR("Game List")}; - static constexpr const char* sort_types[] = { - FSUI_NSTR("Type"), - FSUI_NSTR("Serial"), - FSUI_NSTR("Title"), - FSUI_NSTR("File Title"), - FSUI_NSTR("Time Played"), - FSUI_NSTR("Last Played"), - FSUI_NSTR("File Size"), - FSUI_NSTR("Uncompressed Size"), - FSUI_NSTR("Achievement Unlock/Count"), - }; - - DrawIntListSetting(bsi, FSUI_ICONSTR(ICON_FA_BORDER_ALL, "Default View"), - FSUI_CSTR("Selects the view that the game list will open to."), "Main", - "DefaultFullscreenUIGameView", 0, view_types); - DrawIntListSetting(bsi, FSUI_ICONSTR(ICON_FA_SORT, "Sort By"), - FSUI_CSTR("Determines that field that the game list will be sorted by."), "Main", - "FullscreenUIGameSort", 0, sort_types); - DrawToggleSetting( - bsi, FSUI_ICONSTR(ICON_FA_SORT_ALPHA_DOWN, "Sort Reversed"), - FSUI_CSTR("Reverses the game list sort order from the default (usually ascending to descending)."), "Main", - "FullscreenUIGameSortReverse", false); - DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_LIST, "Merge Multi-Disc Games"), - FSUI_CSTR("Merges multi-disc games into one item in the game list."), "Main", - "FullscreenUIMergeDiscSets", true); - if (DrawToggleSetting( - bsi, FSUI_ICONSTR(ICON_FA_TROPHY, "Show Achievement Trophy Icons"), - FSUI_CSTR("Shows trophy icons in game grid when games have achievements or have been mastered."), "Main", - "FullscreenUIShowTrophyIcons", true)) - { - s_state.game_list_show_trophy_icons = bsi->GetBoolValue("Main", "FullscreenUIShowTrophyIcons", true); - } - } - MenuHeading(FSUI_CSTR("Cover Settings")); { DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_FOLDER, "Covers Directory"), "Folders", "Covers", EmuFolders::Covers); @@ -8169,10 +8138,6 @@ void FullscreenUI::DrawGameListSettingsWindow() } EndMenuButtons(); - - EndFullscreenWindow(); - - SetStandardSelectionFooterText(true); } void FullscreenUI::SwitchToGameList() diff --git a/src/util/imgui_glyph_ranges.inl b/src/util/imgui_glyph_ranges.inl index ad2a8b8b6..e0bc08dea 100644 --- a/src/util/imgui_glyph_ranges.inl +++ b/src/util/imgui_glyph_ranges.inl @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin // SPDX-License-Identifier: CC-BY-NC-ND-4.0 -static constexpr ImWchar FA_ICON_RANGE[] = { 0xe06f,0xe070,0xe086,0xe086,0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf013,0xf017,0xf017,0xf019,0xf019,0xf01c,0xf01c,0xf021,0xf021,0xf023,0xf023,0xf025,0xf026,0xf028,0xf028,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03e,0xf04a,0xf04c,0xf050,0xf050,0xf056,0xf056,0xf059,0xf059,0xf05e,0xf05e,0xf062,0xf063,0xf065,0xf067,0xf071,0xf071,0xf075,0xf075,0xf077,0xf078,0xf07b,0xf07c,0xf083,0xf085,0xf091,0xf091,0xf09c,0xf09c,0xf0ac,0xf0ae,0xf0b2,0xf0b2,0xf0c3,0xf0c3,0xf0c5,0xf0c5,0xf0c7,0xf0c9,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e0,0xf0e0,0xf0e2,0xf0e2,0xf0e7,0xf0e8,0xf0eb,0xf0eb,0xf0f1,0xf0f1,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf110,0xf110,0xf11b,0xf11c,0xf140,0xf140,0xf144,0xf144,0xf146,0xf146,0xf14a,0xf14a,0xf15b,0xf15d,0xf191,0xf192,0xf1ab,0xf1ab,0xf1c0,0xf1c0,0xf1c5,0xf1c5,0xf1de,0xf1de,0xf1e6,0xf1e6,0xf1eb,0xf1eb,0xf1f8,0xf1f8,0xf1fb,0xf1fc,0xf201,0xf201,0xf240,0xf240,0xf242,0xf242,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2c1,0xf2c1,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f1,0xf2f2,0xf302,0xf302,0xf31e,0xf31e,0xf35d,0xf35d,0xf360,0xf360,0xf362,0xf362,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf422,0xf422,0xf424,0xf424,0xf462,0xf462,0xf466,0xf466,0xf4ce,0xf4ce,0xf500,0xf500,0xf517,0xf517,0xf51f,0xf51f,0xf538,0xf538,0xf53f,0xf53f,0xf545,0xf545,0xf547,0xf548,0xf54c,0xf54c,0xf55b,0xf55b,0xf55d,0xf55d,0xf565,0xf565,0xf56e,0xf570,0xf575,0xf575,0xf5a2,0xf5a2,0xf5aa,0xf5aa,0xf5ae,0xf5ae,0xf5c7,0xf5c7,0xf5cb,0xf5cb,0xf5e7,0xf5e7,0xf5ee,0xf5ee,0xf61f,0xf61f,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf6cf,0xf6cf,0xf70c,0xf70c,0xf70e,0xf70e,0xf78c,0xf78c,0xf794,0xf794,0xf7a0,0xf7a0,0xf7a4,0xf7a5,0xf7c2,0xf7c2,0xf807,0xf807,0xf815,0xf815,0xf818,0xf818,0xf84c,0xf84c,0xf853,0xf853,0xf87d,0xf87d,0xf8cc,0xf8cc,0x0,0x0 }; +static constexpr ImWchar FA_ICON_RANGE[] = { 0xe06f,0xe070,0xe086,0xe086,0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf013,0xf017,0xf017,0xf019,0xf019,0xf01c,0xf01c,0xf021,0xf023,0xf025,0xf026,0xf028,0xf028,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03e,0xf04a,0xf04c,0xf050,0xf050,0xf056,0xf056,0xf059,0xf059,0xf05e,0xf05e,0xf062,0xf063,0xf065,0xf067,0xf071,0xf071,0xf075,0xf075,0xf077,0xf078,0xf07b,0xf07c,0xf083,0xf085,0xf091,0xf091,0xf09c,0xf09c,0xf0ac,0xf0ae,0xf0b2,0xf0b2,0xf0c3,0xf0c3,0xf0c5,0xf0c5,0xf0c7,0xf0c9,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e0,0xf0e0,0xf0e2,0xf0e2,0xf0e7,0xf0e8,0xf0eb,0xf0eb,0xf0f1,0xf0f1,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf110,0xf110,0xf11b,0xf11c,0xf140,0xf140,0xf144,0xf144,0xf146,0xf146,0xf14a,0xf14a,0xf15b,0xf15d,0xf191,0xf192,0xf1ab,0xf1ab,0xf1c0,0xf1c0,0xf1c5,0xf1c5,0xf1de,0xf1de,0xf1e6,0xf1e6,0xf1eb,0xf1eb,0xf1f8,0xf1f8,0xf1fb,0xf1fc,0xf201,0xf201,0xf240,0xf240,0xf242,0xf242,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2c1,0xf2c1,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f1,0xf2f2,0xf302,0xf302,0xf31e,0xf31e,0xf35d,0xf35d,0xf360,0xf360,0xf362,0xf362,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf422,0xf422,0xf424,0xf424,0xf462,0xf462,0xf466,0xf466,0xf4ce,0xf4ce,0xf500,0xf500,0xf517,0xf517,0xf51f,0xf51f,0xf538,0xf538,0xf53f,0xf53f,0xf545,0xf545,0xf547,0xf548,0xf54c,0xf54c,0xf55b,0xf55b,0xf55d,0xf55d,0xf565,0xf565,0xf56e,0xf570,0xf575,0xf575,0xf5a2,0xf5a2,0xf5aa,0xf5aa,0xf5ae,0xf5ae,0xf5c7,0xf5c7,0xf5cb,0xf5cb,0xf5e7,0xf5e7,0xf5ee,0xf5ee,0xf61f,0xf61f,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf6cf,0xf6cf,0xf70c,0xf70c,0xf70e,0xf70e,0xf78c,0xf78c,0xf794,0xf794,0xf7a0,0xf7a0,0xf7a4,0xf7a5,0xf7c2,0xf7c2,0xf807,0xf807,0xf815,0xf815,0xf818,0xf818,0xf84c,0xf84c,0xf853,0xf853,0xf87d,0xf87d,0xf8cc,0xf8cc,0x0,0x0 }; static constexpr ImWchar PF_ICON_RANGE[] = { 0x2196,0x2199,0x219e,0x21a3,0x21b0,0x21b3,0x21ba,0x21c3,0x21c7,0x21ca,0x21d0,0x21d4,0x21e0,0x21e3,0x21e6,0x21e8,0x21eb,0x21eb,0x21ed,0x21ee,0x21f7,0x21f8,0x21fa,0x21fb,0x221a,0x221b,0x227a,0x227f,0x2284,0x2284,0x22bf,0x22c8,0x2349,0x2349,0x235e,0x235e,0x2360,0x2361,0x2364,0x2366,0x23b2,0x23b4,0x23cc,0x23cc,0x23ce,0x23ce,0x23f4,0x23f7,0x2427,0x243a,0x243c,0x243e,0x2446,0x2446,0x2460,0x246b,0x248f,0x248f,0x24f5,0x24fd,0x24ff,0x24ff,0x2717,0x2717,0x2753,0x2753,0x278a,0x278e,0x27fc,0x27fc,0xe000,0xe001,0xff21,0xff3a,0x1f52b,0x1f52b,0x0,0x0 };