From 5cab25bbdaa03e26477bda6a547a3a409eb2c52d Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sat, 1 Aug 2015 10:55:03 +0200
Subject: [PATCH] Fixed progress bar weirdness.

---
 resources/text/CHANGELOG       |  1 +
 src/network-web/webbrowser.cpp | 16 ++++++++++------
 src/network-web/webbrowser.h   |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index d74b2243f..21a7a6113 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -23,6 +23,7 @@
   </ul>
   Fixed:
   <ul>
+    <li>Size of downloaded website artifacts is now not hidden by progress bar.</li>
   	<li>Auto-updating of feeds fixed, error was due to master mutex double locking. (issue #117)</li>
     <li>Fixed some memory leaks which might appear when adding/editing categories/feeds.</li>
   <ul>
diff --git a/src/network-web/webbrowser.cpp b/src/network-web/webbrowser.cpp
index f97f98f5c..eda30878a 100755
--- a/src/network-web/webbrowser.cpp
+++ b/src/network-web/webbrowser.cpp
@@ -131,6 +131,9 @@ void WebBrowser::initializeLayout() {
   m_toolBar->addAction(act_discover);
   m_toolBar->addWidget(m_txtLocation);
 
+  m_loadingWidget = new QWidget(this);
+  m_loadingWidget->setFixedHeight(15);
+
   // Initialize dynamic progress bar which will be displayed
   // at the bottom of web browser.
   m_lblProgress = new QLabel(this);
@@ -143,22 +146,23 @@ void WebBrowser::initializeLayout() {
 
   m_loadingLayout = new QHBoxLayout();
   m_loadingLayout->setMargin(0);
-  m_loadingLayout->addWidget(m_lblProgress, 0, Qt::AlignLeft | Qt::AlignVCenter);
-  m_loadingProgress->setLayout(m_loadingLayout);
+  m_loadingLayout->addWidget(m_lblProgress, 0, Qt::AlignVCenter);
+  m_loadingLayout->addWidget(m_loadingProgress, 1, Qt::AlignVCenter);
+  m_loadingWidget->setLayout(m_loadingLayout);
 
   // Setup layout.
   m_layout->addWidget(m_toolBar);
   m_layout->addWidget(m_webView);
-  m_layout->addWidget(m_loadingProgress);
+  m_layout->addWidget(m_loadingWidget);
   m_layout->setMargin(0);
   m_layout->setSpacing(0);
 
-  m_loadingProgress->hide();
+  m_loadingWidget->hide();
 }
 
 void WebBrowser::onLoadingStarted() {
   m_loadingProgress->setValue(0);
-  m_loadingProgress->show();
+  m_loadingWidget->show();
 }
 
 void WebBrowser::onLoadingProgress(int progress) {
@@ -176,7 +180,7 @@ void WebBrowser::onLoadingFinished(bool success) {
     m_btnDiscoverFeeds->clearFeedAddresses();
   }
 
-  m_loadingProgress->hide();
+  m_loadingWidget->hide();
 }
 
 void WebBrowser::createConnections() {
diff --git a/src/network-web/webbrowser.h b/src/network-web/webbrowser.h
index 6d65dd5e8..02464e4bc 100755
--- a/src/network-web/webbrowser.h
+++ b/src/network-web/webbrowser.h
@@ -157,6 +157,7 @@ class WebBrowser : public TabContent {
     LocationLineEdit *m_txtLocation;
     QWidget *m_zoomButtons;
     QToolButton *m_btnResetZoom;
+    QWidget *m_loadingWidget;
     QHBoxLayout *m_loadingLayout;
     QProgressBar *m_loadingProgress;
     QLabel *m_lblProgress;