From 620e2a5ea2d74566297d973b980e927fd43ca26e Mon Sep 17 00:00:00 2001 From: Franz Fellner Date: Thu, 20 Sep 2012 10:04:18 +0200 Subject: [PATCH] Render the bar darker, if set to "Top" or "Bottom", as the small bar could be too hard to recognize. Also set m_progressVisible only to false (in hideProgress), if m_loadProgress==100. If the user clicks a link during the 700ms-timeout, the bar shows for a short time and hideProgress sets m_progressVisible to false, though the page still is loading, which hides the bar in mid-run. This also fixes the weird behaviour of the progressbar on session-restore. --- src/lib/navigation/locationbar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/navigation/locationbar.cpp b/src/lib/navigation/locationbar.cpp index d0be11651..54e35bac3 100644 --- a/src/lib/navigation/locationbar.cpp +++ b/src/lib/navigation/locationbar.cpp @@ -578,7 +578,7 @@ void LocationBar::onMessage(Qz::AppMessageType msg, bool state) void LocationBar::hideProgress() { - if (qzSettings->showLoadingProgress) { + if (qzSettings->showLoadingProgress && m_loadProgress == 100) { m_progressVisible = false; update(); } @@ -618,7 +618,7 @@ void LocationBar::paintEvent(QPaintEvent* event) if (!bg.isValid() || bg.alpha() == 0) { bg = Colors::mid(palette().color(QPalette::Base), palette().color(QPalette::Text), - 10, 1); + m_progressStyle > 0 ? 4 : 8, 1); } p.setBrush(QBrush(bg));