feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.5' into 4.6

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I6a9838d60dd37d4762fa7a345febc3a59e9d8351
This commit is contained in:
Eike Ziller
2018-03-01 15:44:34 +01:00
parent ecced3d3f1 16d1561794
commit ec571d86fd
6 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/progressmanager/progressmanager.cpp
View File

@@ -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)