diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-03-01 15:44:34 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-01 15:44:34 +0100 |
| commit | ec571d86fde5d0ee3ea42613ccd8ebfd843c03a0 (patch) | |
| tree | 09365d075900a41b74266a574af3d09a298151a9 /src/plugins/coreplugin/progressmanager | |
| parent | ecced3d3f199994b00e782fbc231e35842c181ba (diff) | |
| parent | 16d1561794c0b022c0c848f537e10685295bdc8e (diff) | |
| download | qt-creator-ec571d86fde5d0ee3ea42613ccd8ebfd843c03a0.tar.gz | |
Merge remote-tracking branch 'origin/4.5' into 4.6
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: I6a9838d60dd37d4762fa7a345febc3a59e9d8351
Diffstat (limited to 'src/plugins/coreplugin/progressmanager')
| -rw-r--r-- | src/plugins/coreplugin/progressmanager/progressmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index 62ba9c5f9c..f24f3d3f1b 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -273,7 +273,7 @@ ProgressManagerPrivate::ProgressManagerPrivate() m_progressViewPinned(false), m_hovered(false) { - m_opacityEffect->setOpacity(1); + m_opacityEffect->setOpacity(.999); m_instance = this; m_progressView = new ProgressView; // withDelay, so the statusBarWidget has the chance to get the enter event @@ -544,7 +544,7 @@ void ProgressManagerPrivate::stopFadeOfSummaryProgress() { if (m_opacityAnimation) { m_opacityAnimation->stop(); - m_opacityEffect->setOpacity(1.); + m_opacityEffect->setOpacity(.999); delete m_opacityAnimation; } } @@ -690,7 +690,7 @@ void ProgressManagerPrivate::updateStatusDetailsWidget() void ProgressManagerPrivate::summaryProgressFinishedFading() { m_summaryProgressWidget->setVisible(false); - m_opacityEffect->setOpacity(1.); + m_opacityEffect->setOpacity(.999); } void ProgressManagerPrivate::progressDetailsToggled(bool checked) |