diff options
| author | con <qtc-committer@nokia.com> | 2011-06-24 15:47:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-06-24 15:57:59 +0200 |
| commit | 19bdd72805ccea75b6d63193481a0660ba914fb0 (patch) | |
| tree | a8362ba6623242b61b1b2341d9017a8ddf33ce0e /src | |
| parent | 5c9b8946ce68065a81cbf5747d72c8079b2cc2ab (diff) | |
| download | qt-creator-19bdd72805ccea75b6d63193481a0660ba914fb0.tar.gz | |
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: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/coreplugin/progressmanager/futureprogress.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp index c4df54c760..1d5c46bc88 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp +++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp @@ -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; } |