Skip to content

Commit f10758e

Browse files
committed
partial revert of 5dc91b4 to fix regression (fixes #18073)
setMaximumHeight() stays, so hopefully we are still protected from infinit canvas redraw loop.
1 parent 5431a2d commit f10758e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/app/qgisapp.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2782,8 +2782,9 @@ void QgisApp::createStatusBar()
27822782
// And also rendering suppression checkbox
27832783
mProgressBar = new QProgressBar( mStatusBar );
27842784
mProgressBar->setObjectName( QStringLiteral( "mProgressBar" ) );
2785-
mProgressBar->setMaximumWidth( 0 );
2785+
mProgressBar->setMaximumWidth( 100 );
27862786
mProgressBar->setMaximumHeight( 18 );
2787+
mProgressBar->hide();
27872788
mStatusBar->addPermanentWidget( mProgressBar, 1 );
27882789

27892790
connect( mMapCanvas, &QgsMapCanvas::renderStarting, this, &QgisApp::canvasRefreshStarted );
@@ -11072,14 +11073,14 @@ void QgisApp::showProgress( int progress, int totalSteps )
1107211073
if ( progress == totalSteps )
1107311074
{
1107411075
mProgressBar->reset();
11075-
mProgressBar->setMaximumWidth( 0 );
11076+
mProgressBar->hide();
1107611077
}
1107711078
else
1107811079
{
1107911080
//only call show if not already hidden to reduce flicker
11080-
if ( mProgressBar->maximumWidth() == 0 )
11081+
if ( !mProgressBar->isVisible() )
1108111082
{
11082-
mProgressBar->setMaximumWidth( 100 );
11083+
mProgressBar->show();
1108311084
}
1108411085
mProgressBar->setMaximum( totalSteps );
1108511086
mProgressBar->setValue( progress );

0 commit comments

Comments
 (0)