Filters are now applied only when there were actual changes made.

Also disabled the free text filter entry if the system has no games.

es-app/src/guis/GuiGamelistFilter.cpp

@@ -18,10 +18,13 @@
 
 GuiGamelistFilter::GuiGamelistFilter(
         Window* window,
-        SystemData* system)
+        SystemData* system,
+        std::function<void(bool)> filterChangedCallback)
         : GuiComponent(window),
         mMenu(window, "FILTER GAMELIST BY"),
-        mSystem(system)
+        mSystem(system),
+        mFiltersChangedCallback(filterChangedCallback),
+        mFiltersChanged(false)
 {
     initializeMenu();
 }
@@ -49,6 +52,16 @@ void GuiGamelistFilter::initializeMenu()
 
     mMenu.setPosition((Renderer::getScreenWidth() - mMenu.getSize().x()) / 2,
             Renderer::getScreenHeight() * 0.15f);
+
+    // Save the initial filter values to be able to check later if any changes were made.
+    mInitialTextFilter = mTextFilterField->getValue();
+
+    for (std::map<FilterIndexType, std::shared_ptr<OptionListComponent<std::string>>>::
+            const_iterator it = mFilterOptions.cbegin(); it != mFilterOptions.cend(); it++) {
+        std::shared_ptr<OptionListComponent<std::string>> optionList = it->second;
+        std::vector<std::string> filters = optionList->getSelectedObjects();
+        mInitialFilters.push_back(filters);
+    }
 }
 
 void GuiGamelistFilter::resetAllFilters()
@@ -62,6 +75,7 @@ void GuiGamelistFilter::resetAllFilters()
 
     mFilterIndex->setTextFilter("");
     mTextFilterField->setValue("");
+    mFiltersChanged = true;
 }
 
 GuiGamelistFilter::~GuiGamelistFilter()
@@ -80,19 +94,22 @@ void GuiGamelistFilter::addFiltersToMenu()
     mTextFilterField = std::make_shared<TextComponent>(mWindow, "",
             Font::get(FONT_SIZE_MEDIUM), 0x777777FF, ALIGN_RIGHT);
 
-    row.addElement(lbl, true);
+    // Don't show the free text filter entry unless there are any games in the system.
-    row.addElement(mTextFilterField, true);
+    if (mSystem->getRootFolder()->getChildren().size() > 0) {
+        row.addElement(lbl, true);
+        row.addElement(mTextFilterField, true);
 
-    auto spacer = std::make_shared<GuiComponent>(mWindow);
+        auto spacer = std::make_shared<GuiComponent>(mWindow);
-    spacer->setSize(Renderer::getScreenWidth() * 0.005f, 0);
+        spacer->setSize(Renderer::getScreenWidth() * 0.005f, 0);
-    row.addElement(spacer, false);
+        row.addElement(spacer, false);
 
-    auto bracket = std::make_shared<ImageComponent>(mWindow);
+        auto bracket = std::make_shared<ImageComponent>(mWindow);
-    bracket->setImage(":/graphics/arrow.svg");
+        bracket->setImage(":/graphics/arrow.svg");
-    bracket->setResize(Vector2f(0, lbl->getFont()->getLetterHeight()));
+        bracket->setResize(Vector2f(0, lbl->getFont()->getLetterHeight()));
-    row.addElement(bracket, false);
+        row.addElement(bracket, false);
 
-    mTextFilterField->setValue(mFilterIndex->getTextFilter());
+        mTextFilterField->setValue(mFilterIndex->getTextFilter());
+    }
 
     // Callback function.
     auto updateVal = [this](const std::string& newVal) {
@@ -136,14 +153,21 @@ void GuiGamelistFilter::addFiltersToMenu()
 
 void GuiGamelistFilter::applyFilters()
 {
+    if (mInitialTextFilter != mTextFilterField->getValue())
+        mFiltersChanged = true;
+
     std::vector<FilterDataDecl> decls = mFilterIndex->getFilterDataDecls();
     for (std::map<FilterIndexType, std::shared_ptr<OptionListComponent<std::string>>>::
             const_iterator it = mFilterOptions.cbegin(); it != mFilterOptions.cend(); it++) {
         std::shared_ptr<OptionListComponent<std::string>> optionList = it->second;
         std::vector<std::string> filters = optionList->getSelectedObjects();
+        auto iteratorDistance = std::distance(mFilterOptions.cbegin(), it);
+        if (mInitialFilters[iteratorDistance] != filters)
+            mFiltersChanged = true;
         mFilterIndex->setFilter(it->first, &filters);
     }
 
+    mFiltersChangedCallback(mFiltersChanged);
     delete this;
 }
 

es-app/src/guis/GuiGamelistFilter.h

@@ -22,7 +22,8 @@ class SystemData;
 class GuiGamelistFilter : public GuiComponent
 {
 public:
-    GuiGamelistFilter(Window* window, SystemData* system);
+    GuiGamelistFilter(Window* window,
+            SystemData* system, std::function<void(bool)> filtersChangedCallback);
 
     ~GuiGamelistFilter();
     bool input(InputConfig* config, Input input) override;
@@ -37,11 +38,15 @@ private:
     void addFiltersToMenu();
 
     std::map<FilterIndexType, std::shared_ptr<OptionListComponent<std::string>>> mFilterOptions;
+    std::vector<std::vector<std::string>> mInitialFilters;
+    std::string mInitialTextFilter;
 
     MenuComponent mMenu;
     SystemData* mSystem;
     FileFilterIndex* mFilterIndex;
     std::shared_ptr<TextComponent> mTextFilterField;
+    std::function<void(bool)> mFiltersChangedCallback;
+    bool mFiltersChanged;
 };
 
 #endif // ES_APP_GUIS_GUI_GAME_LIST_FILTER_H

es-app/src/guis/GuiGamelistOptions.cpp

@@ -277,12 +277,16 @@ GuiGamelistOptions::~GuiGamelistOptions()
 void GuiGamelistOptions::openGamelistFilter()
 {
     GuiGamelistFilter* ggf;
-    mFiltersChanged = true;
+
+    auto filtersChangedFunc = [this](bool filtersChanged) {
+        mFiltersChanged = filtersChanged;
+    };
 
     if (mIsCustomCollection)
-        ggf = new GuiGamelistFilter(mWindow, getGamelist()->getCursor()->getSystem());
+        ggf = new GuiGamelistFilter(mWindow, getGamelist()->getCursor()->getSystem(),
+                filtersChangedFunc);
     else
-        ggf = new GuiGamelistFilter(mWindow, mSystem);
+        ggf = new GuiGamelistFilter(mWindow, mSystem, filtersChangedFunc);
 
     mWindow->pushGui(ggf);
 }