ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FullscreenUI: Don't show game fixes unless advanced is enabled

This commit is contained in:
Connor McLaughlin 2022-11-26 02:14:50 +10:00 committed by refractionpcsx2
parent d08f4df146
commit 31c02e5915
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcsx2/Frontend/FullscreenUI.cpp
View File

@ -301,6 +301,7 @@ namespace FullscreenUI
static bool IsEditingGameSettings(SettingsInterface* bsi); static bool IsEditingGameSettings(SettingsInterface* bsi);
static SettingsInterface* GetEditingSettingsInterface(); static SettingsInterface* GetEditingSettingsInterface();
static SettingsInterface* GetEditingSettingsInterface(bool game_settings); static SettingsInterface* GetEditingSettingsInterface(bool game_settings);
static bool ShouldShowAdvancedSettings(SettingsInterface* bsi);
static void SetSettingsChanged(SettingsInterface* bsi); static void SetSettingsChanged(SettingsInterface* bsi);
static bool GetEffectiveBoolSetting(SettingsInterface* bsi, const char* section, const char* key, bool default_value); static bool GetEffectiveBoolSetting(SettingsInterface* bsi, const char* section, const char* key, bool default_value);
static s32 GetEffectiveIntSetting(SettingsInterface* bsi, const char* section, const char* key, s32 default_value); static s32 GetEffectiveIntSetting(SettingsInterface* bsi, const char* section, const char* key, s32 default_value);
@ -1167,6 +1168,12 @@ SettingsInterface* FullscreenUI::GetEditingSettingsInterface(bool game_settings)
return (game_settings && s_game_settings_interface) ? s_game_settings_interface.get() : Host::Internal::GetBaseSettingsLayer(); return (game_settings && s_game_settings_interface) ? s_game_settings_interface.get() : Host::Internal::GetBaseSettingsLayer();
} }
bool FullscreenUI::ShouldShowAdvancedSettings(SettingsInterface* bsi)
{
return IsEditingGameSettings(bsi) ? Host::GetBaseBoolSettingValue("UI", "ShowAdvancedSettings", false) :
bsi->GetBoolValue("UI", "ShowAdvancedSettings", false);
}
void FullscreenUI::SetSettingsChanged(SettingsInterface* bsi) void FullscreenUI::SetSettingsChanged(SettingsInterface* bsi)
{ {
if (bsi && bsi == s_game_settings_interface.get()) if (bsi && bsi == s_game_settings_interface.get())
@ -2240,8 +2247,11 @@ void FullscreenUI::DrawSettingsWindow()
"Graphics Settings", "Audio Settings", "Memory Card Settings", "Controller Settings", "Hotkey Settings", "Graphics Settings", "Audio Settings", "Memory Card Settings", "Controller Settings", "Hotkey Settings",
"Achievements Settings", "Folder Settings", "Advanced Settings", "Game Fixes"}; "Achievements Settings", "Folder Settings", "Advanced Settings", "Game Fixes"};
const bool game_settings = IsEditingGameSettings(GetEditingSettingsInterface()); SettingsInterface* bsi = GetEditingSettingsInterface();
const u32 count = game_settings ? std::size(per_game_pages) : std::size(global_pages); const bool game_settings = IsEditingGameSettings(bsi);
const u32 count = game_settings ? (ShouldShowAdvancedSettings(bsi) ? std::size(per_game_pages) : (std::size(per_game_pages) - 1)) :
std::size(global_pages);
const char* const* icons = game_settings ? per_game_icons : global_icons; const char* const* icons = game_settings ? per_game_icons : global_icons;
const SettingsPage* pages = game_settings ? per_game_pages : global_pages; const SettingsPage* pages = game_settings ? per_game_pages : global_pages;
u32 index = 0; u32 index = 0;
@ -3763,8 +3773,7 @@ void FullscreenUI::DrawAdvancedSettingsPage()
SettingsInterface* bsi = GetEditingSettingsInterface(); SettingsInterface* bsi = GetEditingSettingsInterface();
const bool show_advanced_settings = IsEditingGameSettings(bsi) ? Host::GetBaseBoolSettingValue("UI", "ShowAdvancedSettings", false) : const bool show_advanced_settings = ShouldShowAdvancedSettings(bsi);
bsi->GetBoolValue("UI", "ShowAdvancedSettings", false);
BeginMenuButtons(); BeginMenuButtons();