Commit 19bdd728 authored by con's avatar con Committed by Eike Ziller
Browse files

Don't keep canceled tasks forever.

They'll fade "after user interaction" now (since canceling will most
probably lead to mouse movement over the widget that already counts as
interaction, i.e. after pressing 'x' it will fade after a while).

Task-number: QTCREATORBUG-4456
Change-Id: Id095a6bbd5819b93ec8cb9f514b429ef5ab231e9
Reviewed-on: http://codereview.qt.nokia.com/712

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 5c9b8946
......@@ -258,13 +258,14 @@ void FutureProgressPrivate::tryToFadeAway()
{
if (m_isFading)
return;
if (m_keep == FutureProgress::KeepOnFinishTillUserInteraction) {
if (m_keep == FutureProgress::KeepOnFinishTillUserInteraction
|| (m_keep == FutureProgress::DontKeepOnFinish && m_progress->hasError())) {
m_waitingForUserInteraction = true;
//eventfilter is needed to get user interaction
//events to start QTimer::singleShot later
qApp->installEventFilter(m_q);
m_isFading = true;
} else if (m_keep == FutureProgress::DontKeepOnFinish && !m_progress->hasError()) {
} else if (m_keep == FutureProgress::DontKeepOnFinish) {
QTimer::singleShot(shortNotificationTimeout, m_q, SLOT(fadeAway()));
m_isFading = true;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment