partial revert of 5dc91b4 to fix regression (fixes #18073)

nirvn · nirvn · commit f10758e1b608 · 2018-02-12T10:13:14.000+07:00
setMaximumHeight() stays, so hopefully we are still protected
from infinit canvas redraw loop.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2782,8 +2782,9 @@ void QgisApp::createStatusBar()
   // And also rendering suppression checkbox
   mProgressBar = new QProgressBar( mStatusBar );
   mProgressBar->setObjectName( QStringLiteral( "mProgressBar" ) );
-  mProgressBar->setMaximumWidth( 0 );
+  mProgressBar->setMaximumWidth( 100 );
   mProgressBar->setMaximumHeight( 18 );
+  mProgressBar->hide();
   mStatusBar->addPermanentWidget( mProgressBar, 1 );
 
   connect( mMapCanvas, &QgsMapCanvas::renderStarting, this, &QgisApp::canvasRefreshStarted );
@@ -11072,14 +11073,14 @@ void QgisApp::showProgress( int progress, int totalSteps )
   if ( progress == totalSteps )
   {
     mProgressBar->reset();
-    mProgressBar->setMaximumWidth( 0 );
+    mProgressBar->hide();
   }
   else
   {
     //only call show if not already hidden to reduce flicker
-    if ( mProgressBar->maximumWidth() == 0 )
+    if ( !mProgressBar->isVisible() )
     {
-      mProgressBar->setMaximumWidth( 100 );
+      mProgressBar->show();
     }
     mProgressBar->setMaximum( totalSteps );
     mProgressBar->setValue( progress );

Original file line number	Diff line number	Diff line change
`@@ -2782,8 +2782,9 @@ void QgisApp::createStatusBar()`
`2782`	`2782`	`// And also rendering suppression checkbox`
`2783`	`2783`	`mProgressBar = new QProgressBar( mStatusBar );`
`2784`	`2784`	`mProgressBar->setObjectName( QStringLiteral( "mProgressBar" ) );`
`2785`		`- mProgressBar->setMaximumWidth( 0 );`
	`2785`	`+ mProgressBar->setMaximumWidth( 100 );`
`2786`	`2786`	`mProgressBar->setMaximumHeight( 18 );`
	`2787`	`+ mProgressBar->hide();`
`2787`	`2788`	`mStatusBar->addPermanentWidget( mProgressBar, 1 );`
`2788`	`2789`
`2789`	`2790`	`connect( mMapCanvas, &QgsMapCanvas::renderStarting, this, &QgisApp::canvasRefreshStarted );`
`@@ -11072,14 +11073,14 @@ void QgisApp::showProgress( int progress, int totalSteps )`
`11072`	`11073`	`if ( progress == totalSteps )`
`11073`	`11074`	`{`
`11074`	`11075`	`mProgressBar->reset();`
`11075`		`- mProgressBar->setMaximumWidth( 0 );`
	`11076`	`+ mProgressBar->hide();`
`11076`	`11077`	`}`
`11077`	`11078`	`else`
`11078`	`11079`	`{`
`11079`	`11080`	`//only call show if not already hidden to reduce flicker`
`11080`		`- if ( mProgressBar->maximumWidth() == 0 )`
	`11081`	`+ if ( !mProgressBar->isVisible() )`
`11081`	`11082`	`{`
`11082`		`- mProgressBar->setMaximumWidth( 100 );`
	`11083`	`+ mProgressBar->show();`
`11083`	`11084`	`}`
`11084`	`11085`	`mProgressBar->setMaximum( totalSteps );`
`11085`	`11086`	`mProgressBar->setValue( progress );`