From 8704cd84021049f5999cbc2d875be51a528719ee Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 30 May 2024 11:49:09 +0300
Subject: [PATCH] remove duplicate proggress bar

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/pages/modplatform/ResourcePage.cpp |  9 ++-------
 launcher/ui/pages/modplatform/ResourcePage.ui  | 13 -------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp
index 713feb254..4f49cc4f4 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePage.cpp
@@ -67,18 +67,13 @@ ResourcePage::ResourcePage(ResourceDownloadDialog* parent, BaseInstance& base_in
 
     connect(&m_search_timer, &QTimer::timeout, this, &ResourcePage::triggerSearch);
 
-    // hide both progress bars to prevent weird artifact
-    m_ui->fetchProgress->hide();
+    // hide progress bar to prevent weird artifact
     m_fetch_progress.hide();
     m_fetch_progress.hideIfInactive(true);
     m_fetch_progress.setFixedHeight(24);
     m_fetch_progress.progressFormat("");
 
-    auto old = layout()->replaceWidget(m_ui->fetchProgress, &m_fetch_progress);
-    // because we replaced the widget we also need to delete it
-    if (old) {
-        delete old;
-    }
+    m_ui->verticalLayout->insertWidget(1, &m_fetch_progress);
 
     m_ui->packView->setItemDelegate(new ProjectItemDelegate(this));
     m_ui->packView->installEventFilter(this);
diff --git a/launcher/ui/pages/modplatform/ResourcePage.ui b/launcher/ui/pages/modplatform/ResourcePage.ui
index 202ba1ceb..491e7d9f0 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.ui
+++ b/launcher/ui/pages/modplatform/ResourcePage.ui
@@ -25,13 +25,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="ProgressWidget" name="fetchProgress" native="true">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QSplitter" name="splitter">
      <property name="orientation">
@@ -96,12 +89,6 @@
    <extends>QTextBrowser</extends>
    <header>ui/widgets/ProjectDescriptionPage.h</header>
   </customwidget>
-  <customwidget>
-   <class>ProgressWidget</class>
-   <extends>QWidget</extends>
-   <header>ui/widgets/ProgressWidget.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>packView</tabstop>