From 54e4b3a1c4f9695d53e808eece3aca7535d95f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 22 Oct 2026 14:46:46 +0200 Subject: [PATCH] Settings: Show matching settings directly in the search tab Instead of hiding the non-matching views in every tab and disabling the tabs without matches, the search tab now builds each page and shows the matching settings right there, where they can be changed, grouped under their tab and section. Matching a section header shows the whole section, and matching a hint shows its setting. Searches match both the translated and the English text. Each result has an arrow that switches to the setting's tab, scrolls it to the middle and highlights it. The other tabbed screens with search (Developer Tools) keep the old filter for now. Co-Authored-By: Claude Opus 5.5 (1M context) --- UI/GameSettingsScreen.cpp | 154 +++++++++++++++++++++++++++++++++++++- UI/GameSettingsScreen.h | 12 ++- UI/TabbedDialogScreen.cpp | 51 +++++++------ UI/TabbedDialogScreen.h | 2 + 4 files changed, 191 insertions(+), 28 deletions(-) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 4f709325da..b548c83c99 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -28,6 +28,7 @@ #include "Common/UI/Root.h" #include "Common/UI/View.h" #include "Common/UI/ViewGroup.h" +#include "Common/UI/ScrollView.h" #include "Common/UI/Context.h" #include "Common/UI/Notice.h" #include "Common/UI/ScreenManager.h" @@ -264,23 +265,170 @@ void GameSettingsScreen::CreateTabs() { bool showVR = deviceType == DEVICE_TYPE_VR || g_Config.bForceVR; pages_.clear(); + pageViews_.clear(); + pendingFocusView_ = nullptr; for (const PageDef &def : PageDefs()) { if (def.build == &GameSettingsScreen::BuildVRSettings && !showVR) { continue; } pages_.push_back(&def); } + pageViews_.resize(pages_.size()); - for (const PageDef *def : pages_) { - AddTab(def->tag, ms->T(def->title), def->icon ? ImageID(def->icon) : ImageID::invalid(), [this, def](UI::LinearLayout *parent) { + for (int i = 0; i < (int)pages_.size(); i++) { + const PageDef *def = pages_[i]; + AddTab(def->tag, ms->T(def->title), def->icon ? ImageID(def->icon) : ImageID::invalid(), [this, def, i](UI::LinearLayout *parent) { if (def->helpTag) { parent->Add(new PaneTitleBar(gamePath_, T(I18NCat::MAINSETTINGS, def->title), def->helpTag)); } SettingsPage page(def->cat); (this->*def->build)(page); - CreateSettingViews(page, parent, screenManager()); + pageViews_[i].clear(); + CreateSettingViews(page, parent, screenManager(), &pageViews_[i]); }); } + + if (CanShowSearch()) { + AddTab("GameSettingsSearch", ms->T("Search"), ImageID("I_SEARCH"), [this](UI::LinearLayout *parent) { + CreateSearchTab(parent); + }); + } +} + +static bool SettingTextMatches(const SettingText &text, I18NCat pageCat, std::string_view query) { + if (text.empty()) { + return false; + } + return containsNoCase(text.Translate(pageCat), query) || containsNoCase(text.English(), query); +} + +// Shows the matching settings themselves, so they can be changed right here. +void GameSettingsScreen::CreateSearchTab(UI::LinearLayout *parent) { + using namespace UI; + auto se = GetI18NCategory(I18NCat::SEARCH); + + parent->Add(new ItemHeader(se->T("Find settings"))); + parent->Add(new PopupTextInputChoice(GetRequesterToken(), &searchText_, se->T("Filter"), "", 64, screenManager()))->OnChange.Add([this](UI::EventParams &e) { + searchText_ = StripSpaces(searchText_); + RecreateViews(); + }); + if (searchText_.empty()) { + return; + } + parent->Add(new Choice(se->T("Clear filter")))->OnClick.Add([this](UI::EventParams &e) { + searchText_.clear(); + RecreateViews(); + }); + + bool found = false; + for (int p = 0; p < (int)pages_.size(); p++) { + const PageDef *def = pages_[p]; + SettingsPage page(def->cat); + (this->*def->build)(page); + const I18NCat cat = page.DefaultCat(); + const std::deque &items = page.Items(); + + // A matching header shows its whole section, and a matching hint the setting it belongs to. + std::vector show(items.size()); + bool sectionMatches = false; + int lastSetting = -1; + for (int i = 0; i < (int)items.size(); i++) { + const SettingItem &item = items[i]; + bool matches = SettingTextMatches(item.text, cat, searchText_); + switch (item.type) { + case SettingType::Header: + sectionMatches = matches; + break; + case SettingType::Hint: + if (matches && lastSetting >= 0) { + show[lastSetting] = true; + } + break; + default: + lastSetting = i; + show[i] = matches || sectionMatches; + break; + } + } + + const SettingItem *header = nullptr; + bool headerShown = false; + View *prevView = nullptr; + for (int i = 0; i < (int)items.size(); i++) { + const SettingItem &item = items[i]; + if (item.type == SettingType::Header) { + header = &item; + headerShown = false; + continue; + } + if (item.type == SettingType::Hint) { + if (prevView) { + CreateSettingView(item, cat, prevView, parent, screenManager()); + } + continue; + } + prevView = nullptr; + if (!show[i]) { + continue; + } + + LinearLayout *row = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)); + row->SetSpacing(0.0f); + View *view = CreateSettingView(item, cat, nullptr, row, screenManager()); + if (!view) { + delete row; + continue; + } + // FILL_PARENT, since some views (like CheckBox) measure their width from their bounds. + view->ReplaceLayoutParams(new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, 1.0f, Gravity::G_VCENTER)); + Choice *goTo = row->Add(new Choice(ImageID("I_ARROW_RIGHT"), new LinearLayoutParams(ITEM_HEIGHT, ITEM_HEIGHT, 0.0f, Gravity::G_VCENTER))); + goTo->OnClick.Add([this, p, i](UI::EventParams &e) { + GoToSetting(p, i); + }); + + if (!headerShown) { + std::string title(T(I18NCat::MAINSETTINGS, def->title)); + if (header) { + title += " > "; + title += header->text.Translate(cat); + } + parent->Add(new ItemHeader(title)); + headerShown = true; + } + parent->Add(row); + prevView = view; + found = true; + } + } + + if (!found) { + parent->Add(new TextView(ApplySafeSubstitutions(se->T("No settings matched '%1'"), searchText_), new LinearLayoutParams(Margins(20, 5)))); + } +} + +// Switches to the setting's tab, and focuses it (in update) so it's highlighted and scrolled into view. +void GameSettingsScreen::GoToSetting(int pageIndex, int itemIndex) { + SetCurrentTab(pageIndex); + if (pageIndex >= (int)pageViews_.size() || itemIndex >= (int)pageViews_[pageIndex].size()) { + return; + } + pendingFocusView_ = pageViews_[pageIndex][itemIndex]; +} + +void GameSettingsScreen::update() { + UITabbedBaseDialogScreen::update(); + + // The tab may have just been created, or not been laid out while hidden. Scrolling needs the + // view's position, so wait for a layout. + if (pendingFocusView_ && pendingFocusView_->GetBounds().h > 0.0f) { + UI::ScrollView *scrollView = UI::GetEnclosingScrollView(pendingFocusView_); + if (scrollView) { + scrollView->ScrollToCenter(pendingFocusView_); + } + // Highlights it. Done directly, since SetFocus does nothing when focus movement is off (mouse or touch). + UI::SetFocusedView(pendingFocusView_, UI::FocusFlags::CAUSE_RESTORE); + pendingFocusView_ = nullptr; + } } // TODO: Make this generic diff --git a/UI/GameSettingsScreen.h b/UI/GameSettingsScreen.h index f3aebb364c..872f01cadc 100644 --- a/UI/GameSettingsScreen.h +++ b/UI/GameSettingsScreen.h @@ -40,6 +40,7 @@ public: ~GameSettingsScreen(); const char *tag() const override { return "GameSettings"; } + void update() override; protected: void CallbackRestoreDefaults(bool yes); @@ -47,7 +48,8 @@ protected: void dialogFinished(const Screen *dialog, DialogResult result) override; void CreateTabs() override; - bool ShowSearchControls() const override { return true; } + // Has its own search tab, which shows the matching settings instead of filtering the tabs. + bool ShowSearchControls() const override { return false; } private: void PreCreateViews() override; @@ -72,8 +74,14 @@ private: void BuildVRSettings(SettingsPage &page); UI::View *AddNicknameChoice(UI::ViewGroup *parent); - // The tabs shown. + void CreateSearchTab(UI::LinearLayout *parent); + void GoToSetting(int pageIndex, int itemIndex); + + // The tabs shown, and the views created for each page's items (filled in when a tab is created). std::vector pages_; + std::vector> pageViews_; + std::string searchText_; + UI::View *pendingFocusView_ = nullptr; std::string gameID_; #if defined(_WIN32) && !PPSSPP_PLATFORM(UWP) diff --git a/UI/TabbedDialogScreen.cpp b/UI/TabbedDialogScreen.cpp index 81eae5bc48..e6e1617d1e 100644 --- a/UI/TabbedDialogScreen.cpp +++ b/UI/TabbedDialogScreen.cpp @@ -121,29 +121,24 @@ void UITabbedBaseDialogScreen::CreateViews() { } }); - if (System_GetPropertyBool(SYSPROP_HAS_KEYBOARD) || System_GetPropertyBool(SYSPROP_HAS_TEXT_INPUT_DIALOG)) { - // Hide search if screen is too small. - int deviceType = System_GetPropertyInt(SYSPROP_DEVICE_TYPE); - if ((g_display.dp_xres < g_display.dp_yres || g_display.dp_yres >= 500) && (deviceType != DEVICE_TYPE_VR) && ShowSearchControls()) { - // Search - auto ms = GetI18NCategory(I18NCat::MAINSETTINGS); - AddTab("GameSettingsSearch", ms->T("Search"), ImageID("I_SEARCH"), [this](UI::LinearLayout *searchSettings) { - auto se = GetI18NCategory(I18NCat::SEARCH); + if (ShowSearchControls() && CanShowSearch()) { + auto ms = GetI18NCategory(I18NCat::MAINSETTINGS); + AddTab("GameSettingsSearch", ms->T("Search"), ImageID("I_SEARCH"), [this](UI::LinearLayout *searchSettings) { + auto se = GetI18NCategory(I18NCat::SEARCH); - searchSettings->Add(new ItemHeader(se->T("Find settings"))); - searchSettings->Add(new PopupTextInputChoice(GetRequesterToken(), &searchFilter_, se->T("Filter"), "", 64, screenManager()))->OnChange.Add([this](UI::EventParams &e) { - System_PostUIMessage(UIMessage::GAMESETTINGS_SEARCH, StripSpaces(searchFilter_)); - }); - - clearSearchChoice_ = searchSettings->Add(new Choice(se->T("Clear filter"))); - clearSearchChoice_->OnClick.Add([](UI::EventParams &e) { - System_PostUIMessage(UIMessage::GAMESETTINGS_SEARCH, ""); - }); - clearSearchChoice_->SetVisibility(searchFilter_.empty() ? UI::V_GONE : UI::V_VISIBLE); - - noSearchResults_ = searchSettings->Add(new TextView("", new LinearLayoutParams(Margins(20, 5)))); + searchSettings->Add(new ItemHeader(se->T("Find settings"))); + searchSettings->Add(new PopupTextInputChoice(GetRequesterToken(), &searchFilter_, se->T("Filter"), "", 64, screenManager()))->OnChange.Add([this](UI::EventParams &e) { + System_PostUIMessage(UIMessage::GAMESETTINGS_SEARCH, StripSpaces(searchFilter_)); }); - } + + clearSearchChoice_ = searchSettings->Add(new Choice(se->T("Clear filter"))); + clearSearchChoice_->OnClick.Add([](UI::EventParams &e) { + System_PostUIMessage(UIMessage::GAMESETTINGS_SEARCH, ""); + }); + clearSearchChoice_->SetVisibility(searchFilter_.empty() ? UI::V_GONE : UI::V_VISIBLE); + + noSearchResults_ = searchSettings->Add(new TextView("", new LinearLayoutParams(Margins(20, 5)))); + }); } // After the search tab, which the saved tab can be. @@ -185,10 +180,20 @@ void UITabbedBaseDialogScreen::SetCurrentTab(int tab) { tabHolder_->SetCurrentTab(tab); } +bool UITabbedBaseDialogScreen::CanShowSearch() { + if (!System_GetPropertyBool(SYSPROP_HAS_KEYBOARD) && !System_GetPropertyBool(SYSPROP_HAS_TEXT_INPUT_DIALOG)) { + return false; + } + // Hide search if screen is too small. + int deviceType = System_GetPropertyInt(SYSPROP_DEVICE_TYPE); + return (g_display.dp_xres < g_display.dp_yres || g_display.dp_yres >= 500) && deviceType != DEVICE_TYPE_VR; +} + void UITabbedBaseDialogScreen::ApplySearchFilter() { using namespace UI; - // GAMESETTINGS_SEARCH is broadcast to every screen, including ones whose views don't exist yet. - if (!tabHolder_) { + // GAMESETTINGS_SEARCH is broadcast to every screen, including ones whose views don't exist yet, + // and ones that search some other way. + if (!tabHolder_ || !ShowSearchControls()) { return; } auto se = GetI18NCategory(I18NCat::SEARCH); diff --git a/UI/TabbedDialogScreen.h b/UI/TabbedDialogScreen.h index 0e02f067d0..198eb7b736 100644 --- a/UI/TabbedDialogScreen.h +++ b/UI/TabbedDialogScreen.h @@ -50,6 +50,8 @@ protected: int GetCurrentTab() const; void SetCurrentTab(int tab); + // Whether there's room and a way to type a search. + static bool CanShowSearch(); void sendMessage(UIMessage message, const char *value) override;