diff --git a/Core/Config.cpp b/Core/Config.cpp index d33e9f49de..5ed393f27b 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -211,9 +211,10 @@ static int GameBrowserViewFromGridView(int legacyGridView, GameBrowserViewMode d return (int)(legacyGridView ? GameBrowserViewMode::GRID : GameBrowserViewMode::LIST); } +// Games and Homebrew switch everyone to the large list, ignoring the old setting. The others keep it. static int DefaultGameBrowserView1() { return GameBrowserViewFromGridView(g_Config.iLegacyGridView1, GameBrowserViewMode::GRID); } -static int DefaultGameBrowserView2() { return GameBrowserViewFromGridView(g_Config.iLegacyGridView2, GameBrowserViewMode::LARGE_LIST); } -static int DefaultGameBrowserView3() { return GameBrowserViewFromGridView(g_Config.iLegacyGridView3, GameBrowserViewMode::LARGE_LIST); } +static int DefaultGameBrowserView2() { return (int)GameBrowserViewMode::LARGE_LIST; } +static int DefaultGameBrowserView3() { return (int)GameBrowserViewMode::LARGE_LIST; } static int DefaultGameBrowserView4() { return GameBrowserViewFromGridView(g_Config.iLegacyGridView4, GameBrowserViewMode::LIST); } static float DefaultGameGridScale() { @@ -305,8 +306,6 @@ static const ConfigSetting generalSettings[] = { ConfigSetting("ShowIDOnGameIcon", SETTING(g_Config, bShowIDOnGameIcon), false, CfgFlag::DEFAULT), ConfigSetting("GameGridScale", SETTING(g_Config, fGameGridScale), &DefaultGameGridScale, CfgFlag::DEFAULT), ConfigSetting("GridView1", SETTING(g_Config, iLegacyGridView1), -1, &LegacyGridViewToString, &LegacyGridViewFromString, CfgFlag::DONT_SAVE), - ConfigSetting("GridView2", SETTING(g_Config, iLegacyGridView2), -1, &LegacyGridViewToString, &LegacyGridViewFromString, CfgFlag::DONT_SAVE), - ConfigSetting("GridView3", SETTING(g_Config, iLegacyGridView3), -1, &LegacyGridViewToString, &LegacyGridViewFromString, CfgFlag::DONT_SAVE), ConfigSetting("GridView4", SETTING(g_Config, iLegacyGridView4), -1, &LegacyGridViewToString, &LegacyGridViewFromString, CfgFlag::DONT_SAVE), // These must come after GridView*, which their defaults are taken from. ConfigSetting("GameBrowserView1", SETTING(g_Config, iGameBrowserView1), &DefaultGameBrowserView1, CfgFlag::DEFAULT), diff --git a/Core/Config.h b/Core/Config.h index 41831ba759..9c7ce903be 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -475,8 +475,6 @@ public: int iGameBrowserView4; // The old GridView bools, only read, to migrate to iGameBrowserView*. -1 if missing. int iLegacyGridView1; - int iLegacyGridView2; - int iLegacyGridView3; int iLegacyGridView4; // Right analog binding