Merge branch 'search-settings'

src/widgets/settingspages/GeneralPage.cpp

@@ -38,20 +38,13 @@ TitleLabel *SettingsLayout::addTitle(const QString &title)
 {
     auto label = new TitleLabel(title + ":");
 
-    if (this->count() != 0)
-        this->addSpacing(16);
-
+    if (this->count() == 0)
+        label->setStyleSheet("margin-top: 0");
     this->addWidget(label);
-    return label;
-}
 
-TitleLabel2 *SettingsLayout::addTitle2(const QString &title)
-{
-    auto label = new TitleLabel2(title + ":");
+    // groups
+    this->groups_.push_back(Group{title, label, {}});
 
-    this->addSpacing(16);
-
-    this->addWidget(label);
     return label;
 }
 
@@ -73,6 +66,10 @@ QCheckBox *SettingsLayout::addCheckbox(const QString &text,
         [&setting, inverse](bool state) { setting = inverse ^ state; });
 
     this->addWidget(check);
+
+    // groups
+    this->groups_.back().widgets.push_back({check, {text}});
+
     return check;
 }
 
@@ -84,11 +81,17 @@ ComboBox *SettingsLayout::addDropdown(const QString &text,
     combo->setFocusPolicy(Qt::StrongFocus);
     combo->addItems(list);
 
-    layout->addWidget(new QLabel(text + ":"));
+    auto label = new QLabel(text + ":");
+    layout->addWidget(label);
     layout->addStretch(1);
     layout->addWidget(combo);
 
     this->addLayout(layout);
+
+    // groups
+    this->groups_.back().widgets.push_back({combo, {text}});
+    this->groups_.back().widgets.push_back({label, {text}});
+
     return combo;
 }
 
@@ -126,6 +129,9 @@ DescriptionLabel *SettingsLayout::addDescription(const QString &text)
 
     this->addWidget(label);
 
+    // groups
+    this->groups_.back().widgets.push_back({label, {text}});
+
     return label;
 }
 
@@ -134,6 +140,64 @@ void SettingsLayout::addSeperator()
     this->addWidget(new Line(false));
 }
 
+bool SettingsLayout::filterElements(const QString &query)
+{
+    bool any{};
+
+    for (auto &&group : this->groups_)
+    {
+        // if a description in a group matches `query` then show the entire group
+        bool descriptionMatches{};
+        for (auto &&widget : group.widgets)
+        {
+            if (auto x = dynamic_cast<DescriptionLabel *>(widget.element); x)
+            {
+                if (x->text().contains(query, Qt::CaseInsensitive))
+                {
+                    descriptionMatches = true;
+                    break;
+                }
+            }
+        }
+
+        // if group name matches then all should be visible
+        if (group.name.contains(query, Qt::CaseInsensitive) ||
+            descriptionMatches)
+        {
+            for (auto &&widget : group.widgets)
+                widget.element->show();
+            group.title->show();
+            any = true;
+        }
+        // check if any match
+        else
+        {
+            auto groupAny = false;
+
+            for (auto &&widget : group.widgets)
+            {
+                for (auto &&keyword : widget.keywords)
+                {
+                    if (keyword.contains(query, Qt::CaseInsensitive))
+                    {
+                        widget.element->show();
+                        groupAny = true;
+                    }
+                    else
+                    {
+                        widget.element->hide();
+                    }
+                }
+            }
+
+            group.title->setVisible(groupAny);
+            any |= groupAny;
+        }
+    }
+
+    return any;
+}
+
 GeneralPage::GeneralPage()
     : SettingsPage("General", ":/settings/about.svg")
 {
@@ -143,6 +207,7 @@ GeneralPage::GeneralPage()
     y->addWidget(scroll);
     auto x = new QHBoxLayout;
     auto layout = new SettingsLayout;
+    this->settingsLayout_ = layout;
     x->addLayout(layout, 0);
     x->addStretch(1);
     auto z = new QFrame;
@@ -157,6 +222,16 @@ GeneralPage::GeneralPage()
     this->initExtra();
 }
 
+bool GeneralPage::filterElements(const QString &query)
+{
+    if (this->settingsLayout_)
+        return this->settingsLayout_->filterElements(query) ||
+               this->name_.contains(query, Qt::CaseInsensitive) ||
+               query.isEmpty();
+    else
+        return false;
+}
+
 void GeneralPage::initLayout(SettingsLayout &layout)
 {
     auto &s = *getSettings();
@@ -353,15 +428,19 @@ void GeneralPage::initLayout(SettingsLayout &layout)
                           "store in this directory.");
     layout.addWidget(makeOpenSettingDirButton());
 
-}  // namespace chatterino
+    // invisible element for width
+    auto inv = new BaseWidget(this);
+    inv->setScaleIndependantWidth(500);
+    layout.addWidget(inv);
+}
 
 void GeneralPage::initExtra()
 {
     /// update cache path
-    if (this->cachePath)
+    if (this->cachePath_)
     {
         getSettings()->cachePath.connect(
-            [cachePath = this->cachePath](const auto &, auto) mutable {
+            [cachePath = this->cachePath_](const auto &, auto) mutable {
                 QString newPath = getPaths()->cacheDirectory();
 
                 QString pathShortened = "Current location: <a href=\"file:///" +