Revert "Fix progress bar"

This reverts commit 064eb92e77.

src/lib/CMakeLists.txt

@@ -254,6 +254,7 @@ set(SRCS ${SRCS}
     tools/mactoolbutton.cpp
     tools/menubar.cpp
     tools/pagethumbnailer.cpp
+    tools/progressbar.cpp
     tools/qztools.cpp
     tools/removeitemfocusdelegate.cpp
     tools/scripts.cpp
@@ -487,6 +488,7 @@ set(SRCS ${SRCS}
     tools/mactoolbutton.h
     tools/menubar.h
     tools/pagethumbnailer.h
+    tools/progressbar.h
     tools/qztools.h
     tools/removeitemfocusdelegate.h
     tools/scripts.h

src/lib/app/browserwindow.cpp

@@ -36,6 +36,7 @@
 #include "clickablelabel.h"
 #include "docktitlebarwidget.h"
 #include "iconprovider.h"
+#include "progressbar.h"
 #include "closedwindowsmanager.h"
 #include "statusbar.h"
 #include "browsinglibrary.h"
@@ -71,7 +72,6 @@
 #include <QWebEngineHistory>
 #include <QWebEngineSettings>
 #include <QMessageBox>
-#include <QProgressBar>
 #include <QToolTip>
 #include <QScrollArea>
 #include <QCollator>
@@ -387,7 +387,7 @@ void BrowserWindow::setupUi()
     m_statusBar->setObjectName(QSL("mainwindow-statusbar"));
     m_statusBar->setCursor(Qt::ArrowCursor);
     setStatusBar(m_statusBar);
-    m_progressBar = new QProgressBar(m_statusBar);
+    m_progressBar = new ProgressBar(m_statusBar);
     m_ipLabel = new QLabel(this);
     m_ipLabel->setObjectName(QSL("statusbar-ip-label"));
     m_ipLabel->setToolTip(tr("IP Address of current page"));

src/lib/app/browserwindow.h

@@ -27,7 +27,6 @@
 
 class QLabel;
 class QVBoxLayout;
-class QProgressBar;
 class QSplitter;
 class QWebEngineFrame;
 class QTimer;
@@ -46,6 +45,7 @@ class WebView;
 class WebPage;
 class SideBar;
 class SideBarManager;
+class ProgressBar;
 class StatusBar;
 class NavigationBar;
 class NavigationContainer;
@@ -214,7 +214,7 @@ private:
     NavigationBar* m_navigationToolbar;
     BookmarksToolbar* m_bookmarksToolbar;
 
-    QProgressBar* m_progressBar;
+    ProgressBar* m_progressBar;
     QLabel* m_ipLabel;
 
     QMenu* m_superMenu;

src/lib/popupwindow/popupwindow.cpp

@@ -19,6 +19,7 @@
 #include "popupwebview.h"
 #include "webpage.h"
 #include "popupstatusbarmessage.h"
+#include "progressbar.h"
 #include "searchtoolbar.h"
 #include "qzsettings.h"
 #include "popuplocationbar.h"
@@ -26,11 +27,10 @@
 #include "mainapplication.h"
 #include "browserwindow.h"
 
+#include <QVBoxLayout>
+#include <QStatusBar>
 #include <QCloseEvent>
 #include <QMenuBar>
-#include <QProgressBar>
-#include <QStatusBar>
-#include <QVBoxLayout>
 
 PopupWindow::PopupWindow(PopupWebView* view)
     : QWidget()
@@ -53,7 +53,7 @@ PopupWindow::PopupWindow(PopupWebView* view)
     m_statusBar = new QStatusBar(this);
     m_statusBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
 
-    m_progressBar = new QProgressBar(m_statusBar);
+    m_progressBar = new ProgressBar(m_statusBar);
     m_statusBar->addPermanentWidget(m_progressBar);
     m_progressBar->hide();
 

src/lib/popupwindow/popupwindow.h

@@ -23,16 +23,16 @@
 
 #include "qzcommon.h"
 
-class QMenu;
-class QMenuBar;
-class QProgressBar;
-class QStatusBar;
 class QVBoxLayout;
+class QStatusBar;
+class QMenuBar;
+class QMenu;
 
 class WebPage;
 class PopupWebView;
 class PopupStatusBarMessage;
 class PopupLocationBar;
+class ProgressBar;
 class SearchToolBar;
 
 class FALKON_EXPORT PopupWindow : public QWidget
@@ -65,7 +65,7 @@ private:
     PopupWebView* m_view;
     PopupLocationBar* m_locationBar;
     PopupStatusBarMessage* m_statusBarMessage;
-    QProgressBar* m_progressBar;
+    ProgressBar* m_progressBar;
 
     QVBoxLayout* m_layout;
     QStatusBar* m_statusBar;

src/lib/tools/progressbar.cpp

@@ -0,0 +1,64 @@
+/* ============================================================
+* Falkon - Qt web browser
+* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
+#include "progressbar.h"
+
+#include <QStylePainter>
+#include <QStyleOptionProgressBar>
+
+ProgressBar::ProgressBar(QWidget* parent)
+    : QWidget(parent)
+    , m_value(0)
+    , m_lastPaintedValue(-1)
+{
+    setMinimumSize(130, 16);
+    setMaximumSize(150, 16);
+}
+
+void ProgressBar::setValue(int value)
+{
+    m_value = value;
+    if (m_lastPaintedValue != m_value) {
+        update();
+    }
+}
+
+void ProgressBar::initStyleOption(QStyleOptionProgressBar* option)
+{
+    if (!option) {
+        return;
+    }
+
+    option->initFrom(this);
+    option->minimum = 0;
+    option->maximum = 100;
+    option->progress = m_value;
+    option->textAlignment = Qt::AlignLeft;
+    option->textVisible = false;
+}
+
+void ProgressBar::paintEvent(QPaintEvent*)
+{
+    QStylePainter paint(this);
+
+    QStyleOptionProgressBar opt;
+    initStyleOption(&opt);
+
+    paint.drawControl(QStyle::CE_ProgressBar, opt);
+
+    m_lastPaintedValue = m_value;
+}

src/lib/tools/progressbar.h

@@ -0,0 +1,45 @@
+/* ============================================================
+* Falkon - Qt web browser
+* Copyright (C) 2010-2014  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
+#ifndef PROGRESSBAR_H
+#define PROGRESSBAR_H
+
+#include <QWidget>
+
+#include "qzcommon.h"
+
+class QStyleOptionProgressBar;
+
+class FALKON_EXPORT ProgressBar : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit ProgressBar(QWidget* parent = nullptr);
+
+public Q_SLOTS:
+    void setValue(int value);
+
+protected:
+    void paintEvent(QPaintEvent* e) override;
+    void initStyleOption(QStyleOptionProgressBar* option);
+
+private:
+    int m_value;
+    int m_lastPaintedValue;
+};
+
+#endif // PROGRESSBAR_H

src/lib/webtab/tabbedwebview.cpp

@@ -23,6 +23,7 @@
 #include "tabbar.h"
 #include "webtab.h"
 #include "statusbar.h"
+#include "progressbar.h"
 #include "navigationbar.h"
 #include "iconprovider.h"
 #include "searchenginesmanager.h"