4 files changed, 51 insertions, 19 deletions

diff --git a/launcher/ui/pages/modplatform/ModPage.cpp b/launcher/ui/pages/modplatform/ModPage.cpp
index a34a74db..986caa77 100644
--- a/launcher/ui/pages/modplatform/ModPage.cpp
+++ b/launcher/ui/pages/modplatform/ModPage.cpp
@@ -47,12 +47,12 @@
 #include "ui/dialogs/ModDownloadDialog.h"
 #include "ui/widgets/ProjectItem.h"
 
+
 ModPage::ModPage(ModDownloadDialog* dialog, BaseInstance* instance, ModAPI* api)
     : QWidget(dialog)
     , m_instance(instance)
     , ui(new Ui::ModPage)
     , dialog(dialog)
-    , filter_widget(static_cast<MinecraftInstance*>(instance)->getPackProfile()->getComponentVersion("net.minecraft"), this)
     , m_fetch_progress(this, false)
     , api(api)
 {
@@ -76,17 +76,6 @@ ModPage::ModPage(ModDownloadDialog* dialog, BaseInstance* instance, ModAPI* api)
     m_fetch_progress.progressFormat("");
 
     ui->gridLayout_3->addWidget(&m_fetch_progress, 0, 0, 1, ui->gridLayout_3->columnCount());
-    ui->gridLayout_3->addWidget(&filter_widget, 1, 0, 1, ui->gridLayout_3->columnCount());
-
-    filter_widget.setInstance(static_cast<MinecraftInstance*>(m_instance));
-    m_filter = filter_widget.getFilter();
-
-    connect(&filter_widget, &ModFilterWidget::filterChanged, this, [&]{
-        ui->searchButton->setStyleSheet("text-decoration: underline");
-    });
-    connect(&filter_widget, &ModFilterWidget::filterUnchanged, this, [&]{
-        ui->searchButton->setStyleSheet("text-decoration: none");
-    });
 
     ui->packView->setItemDelegate(new ProjectItemDelegate(this));
     ui->packView->installEventFilter(this);
@@ -97,6 +86,26 @@ ModPage::~ModPage()
     delete ui;
 }
 
+void ModPage::setFilterWidget(unique_qobject_ptr<ModFilterWidget>& widget)
+{
+    if (m_filter_widget)
+        disconnect(m_filter_widget.get(), nullptr, nullptr, nullptr);
+
+    m_filter_widget.swap(widget);
+
+    ui->gridLayout_3->addWidget(m_filter_widget.get(), 0, 0, 1, ui->gridLayout_3->columnCount());
+
+    m_filter_widget->setInstance(static_cast<MinecraftInstance*>(m_instance));
+    m_filter = m_filter_widget->getFilter();
+
+    connect(m_filter_widget.get(), &ModFilterWidget::filterChanged, this, [&]{
+        ui->searchButton->setStyleSheet("text-decoration: underline");
+    });
+    connect(m_filter_widget.get(), &ModFilterWidget::filterUnchanged, this, [&]{
+        ui->searchButton->setStyleSheet("text-decoration: none");
+    });
+}
+
 
 /******** Qt things ********/
 
@@ -141,13 +150,13 @@ auto ModPage::eventFilter(QObject* watched, QEvent* event) -> bool
 
 void ModPage::filterMods()
 {
-    filter_widget.setHidden(!filter_widget.isHidden());
+    m_filter_widget->setHidden(!m_filter_widget->isHidden());
 }
 
 void ModPage::triggerSearch()
 {
-    auto changed = filter_widget.changed();
-    m_filter = filter_widget.getFilter();
+    auto changed = m_filter_widget->changed();
+    m_filter = m_filter_widget->getFilter();
     
     if(changed){
         ui->packView->clearSelection();
diff --git a/launcher/ui/pages/modplatform/ModPage.h b/launcher/ui/pages/modplatform/ModPage.h
index 09c38d8b..3f31651c 100644
--- a/launcher/ui/pages/modplatform/ModPage.h
+++ b/launcher/ui/pages/modplatform/ModPage.h
@@ -21,7 +21,17 @@ class ModPage : public QWidget, public BasePage {
     Q_OBJECT
 
    public:
-    explicit ModPage(ModDownloadDialog* dialog, BaseInstance* instance, ModAPI* api);
+    template<typename T>
+    static T* create(ModDownloadDialog* dialog, BaseInstance* instance)
+    {
+        auto page = new T(dialog, instance);
+
+        auto filter_widget = ModFilterWidget::create(static_cast<MinecraftInstance*>(instance)->getPackProfile()->getComponentVersion("net.minecraft"), page);
+        page->setFilterWidget(filter_widget);
+
+        return page;
+    }
+
     ~ModPage() override;
 
     /* Affects what the user sees */
@@ -51,6 +61,8 @@ class ModPage : public QWidget, public BasePage {
     /** Programatically set the term in the search bar. */
     void setSearchTerm(QString);
 
+    void setFilterWidget(unique_qobject_ptr<ModFilterWidget>&);
+
     auto getCurrent() -> ModPlatform::IndexedPack& { return current; }
     void updateModVersions(int prev_count = -1);
 
@@ -60,6 +72,7 @@ class ModPage : public QWidget, public BasePage {
     BaseInstance* m_instance;
 
    protected:
+    ModPage(ModDownloadDialog* dialog, BaseInstance* instance, ModAPI* api);
     void updateSelectionButton();
 
    protected slots:
@@ -73,7 +86,7 @@ class ModPage : public QWidget, public BasePage {
     Ui::ModPage* ui = nullptr;
     ModDownloadDialog* dialog = nullptr;
 
-    ModFilterWidget filter_widget;
+    unique_qobject_ptr<ModFilterWidget> m_filter_widget;
     std::shared_ptr<ModFilterWidget::Filter> m_filter;
 
     ProgressWidget m_fetch_progress;
diff --git a/launcher/ui/pages/modplatform/flame/FlameModPage.h b/launcher/ui/pages/modplatform/flame/FlameModPage.h
index 445d0368..2cd484cb 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModPage.h
+++ b/launcher/ui/pages/modplatform/flame/FlameModPage.h
@@ -44,7 +44,12 @@ class FlameModPage : public ModPage {
     Q_OBJECT
 
    public:
-    explicit FlameModPage(ModDownloadDialog* dialog, BaseInstance* instance);
+    static FlameModPage* create(ModDownloadDialog* dialog, BaseInstance* instance)
+    {
+        return ModPage::create<FlameModPage>(dialog, instance);
+    }
+
+    FlameModPage(ModDownloadDialog* dialog, BaseInstance* instance);
     ~FlameModPage() override = default;
 
     inline auto displayName() const -> QString override { return "CurseForge"; }
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModPage.h b/launcher/ui/pages/modplatform/modrinth/ModrinthModPage.h
index 94985f63..40d82e6f 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModPage.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModPage.h
@@ -44,7 +44,12 @@ class ModrinthModPage : public ModPage {
     Q_OBJECT
 
    public:
-    explicit ModrinthModPage(ModDownloadDialog* dialog, BaseInstance* instance);
+    static ModrinthModPage* create(ModDownloadDialog* dialog, BaseInstance* instance)
+    {
+        return ModPage::create<ModrinthModPage>(dialog, instance);
+    }
+
+    ModrinthModPage(ModDownloadDialog* dialog, BaseInstance* instance);
     ~ModrinthModPage() override = default;
 
     inline auto displayName() const -> QString override { return "Modrinth"; }