Merge remote-tracking branch 'origin/4.6'

Change-Id: I63f8aebb201936f671b1486ff9420f67e5e3fafc
This commit is contained in:
Eike Ziller
2018-03-01 15:46:37 +01:00
36 changed files with 298 additions and 73 deletions

View File

@@ -272,7 +272,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
@@ -540,7 +540,7 @@ void ProgressManagerPrivate::stopFadeOfSummaryProgress()
{
if (m_opacityAnimation) {
m_opacityAnimation->stop();
m_opacityEffect->setOpacity(1.);
m_opacityEffect->setOpacity(.999);
delete m_opacityAnimation;
}
}
@@ -686,7 +686,7 @@ void ProgressManagerPrivate::updateStatusDetailsWidget()
void ProgressManagerPrivate::summaryProgressFinishedFading()
{
m_summaryProgressWidget->setVisible(false);
m_opacityEffect->setOpacity(1.);
m_opacityEffect->setOpacity(.999);
}
void ProgressManagerPrivate::progressDetailsToggled(bool checked)