Merge master into release

dg0yt · web-flow · commit ac4b084e8290 · 2020-10-03T08:03:35.000+02:00
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
@@ -533,7 +533,10 @@ void MainWindow::showStatusBarMessage(const QString& text, int timeout)
 void MainWindow::showStatusBarMessageImmediately(const QString& text, int timeout)
 {
 	showStatusBarMessage(text, timeout);
-	QApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 10 /* ms */);
+	// Make sure that paint events reach the user screen, by processing events
+	// until the queue is empty, including events appended during processing.
+	// In the worst case, this will stop after 100 ms.
+	QApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 100 /* ms */);
 }
 
 void MainWindow::clearStatusBarMessage()

Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,10 @@ void MainWindow::showStatusBarMessage(const QString& text, int timeout)`
`533`	`533`	`void MainWindow::showStatusBarMessageImmediately(const QString& text, int timeout)`
`534`	`534`	`{`
`535`	`535`	`showStatusBarMessage(text, timeout);`
`536`		`- QApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 10 /* ms */);`
	`536`	`+ // Make sure that paint events reach the user screen, by processing events`
	`537`	`+ // until the queue is empty, including events appended during processing.`
	`538`	`+ // In the worst case, this will stop after 100 ms.`
	`539`	`+ QApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 100 /* ms */);`
`537`	`540`	`}`
`538`	`541`
`539`	`542`	`void MainWindow::clearStatusBarMessage()`