forked from qt-creator/qt-creator
		
	Merge remote-tracking branch 'origin/4.6'
Change-Id: I63f8aebb201936f671b1486ff9420f67e5e3fafc
This commit is contained in:
		@@ -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)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user