[ui] prevent infinite canvas redraw due to (#6098)

progress bar changing status bar height when shown/hidden. Yes, it's as bad as it sounds.
qgis · Jan 18, 2018 · 5dc91b4 · 5dc91b4
1 parent bc1bfd3
commit 5dc91b4
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2783,10 +2783,8 @@ void QgisApp::createStatusBar()
   // And also rendering suppression checkbox
   mProgressBar = new QProgressBar( mStatusBar );
   mProgressBar->setObjectName( QStringLiteral( "mProgressBar" ) );
-  mProgressBar->setMaximumWidth( 100 );
-  mProgressBar->hide();
-  mProgressBar->setWhatsThis( tr( "Progress bar that displays the status "
-                                  "of rendering layers and other time-intensive operations" ) );
+  mProgressBar->setMaximumWidth( 0 );
+  mProgressBar->setMaximumHeight( 18 );
   mStatusBar->addPermanentWidget( mProgressBar, 1 );
 
   connect( mMapCanvas, &QgsMapCanvas::renderStarting, this, &QgisApp::canvasRefreshStarted );
@@ -11084,14 +11082,14 @@ void QgisApp::showProgress( int progress, int totalSteps )
   if ( progress == totalSteps )
   {
     mProgressBar->reset();
-    mProgressBar->hide();
+    mProgressBar->setMaximumWidth( 0 );
   }
   else
   {
     //only call show if not already hidden to reduce flicker
-    if ( !mProgressBar->isVisible() )
+    if ( mProgressBar->maximumWidth() == 0 )
     {
-      mProgressBar->show();
+      mProgressBar->setMaximumWidth( 100 );
     }
     mProgressBar->setMaximum( totalSteps );
     mProgressBar->setValue( progress );