feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProgressBar: Always show a minimal progress

Browse Source 
... In order to avoid an empty progress bar background which can be
confusing especially with flat themes.

Change-Id: I062267f7a3f2627e0d043821a2dbd7462b6ce11f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-03-17 10:40:49 +01:00
parent bc481dc399
commit 22a0bdcdbe
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/coreplugin/progressmanager/progressbar.cpp
View File

@@ -229,11 +229,7 @@ void ProgressBar::paintEvent(QPaintEvent *)
double range = maximum() - minimum();
double percent = 0.;
if (!qFuzzyIsNull(range))
percent = (value() - minimum()) / range;
if (percent > 1)
percent = 1;
else if (percent < 0)
percent = 0;
percent = qBound(0., (value() - minimum()) / range, 1.);
if (finished())
percent = 1;
@@ -285,17 +281,15 @@ void ProgressBar::paintEvent(QPaintEvent *)
QRectF inner = rect.adjusted(2, 2, -2, -2);
inner.adjust(0, 0, qRound((percent - 1) * inner.width()), 0);
QColor c;
if (m_error) {
c = creatorTheme()->color(Theme::ProgressBarColorError);
// avoid too small red bar
if (inner.width() < 10)
inner.adjust(0, 0, 10 - inner.width(), 0);
} else if (m_finished) {
c = creatorTheme()->color(Theme::ProgressBarColorFinished);
} else {
c = creatorTheme()->color(Theme::ProgressBarColorNormal);
}
// Show at least a hint of progress. Non-flat needs more pixels due to the borders.
inner.setWidth(qMax(qMin(3.0, qreal(rect.width())), inner.width()));
Theme::Color themeColor = Theme::ProgressBarColorNormal;
if (m_error)
themeColor = Theme::ProgressBarColorError;
else if (m_finished)
themeColor = Theme::ProgressBarColorFinished;
const QColor c = creatorTheme()->color(themeColor);
//draw the progress bar
if (creatorTheme()->widgetStyle() == Theme::StyleFlat) {