diff --git a/src/sourcetree/animationhelper.cpp b/src/sourcetree/animationhelper.cpp index 42b496e64..c49f58e74 100644 --- a/src/sourcetree/animationhelper.cpp +++ b/src/sourcetree/animationhelper.cpp @@ -83,9 +83,10 @@ bool AnimationHelper::partlyExpanded() if ( m_forceClosing ) return false; - return m_fullyExpanded - || ( m_expandAnimation->state() == QPropertyAnimation::Running && m_expandAnimation->currentTime() > 250 ) - || ( m_collapseAnimation->state() == QPropertyAnimation::Running && m_collapseAnimation->currentTime() < 100 ); + return m_size != m_startSize; +// return m_fullyExpanded +// || ( m_expandAnimation->state() == QPropertyAnimation::Running && m_expandAnimation->currentTime() > 250 ) +// || ( m_collapseAnimation->state() == QPropertyAnimation::Running && m_collapseAnimation->currentTime() < 100 ); } bool AnimationHelper::fullyExpanded() diff --git a/src/sourcetree/sourcedelegate.cpp b/src/sourcetree/sourcedelegate.cpp index c02764cc7..a5c40182f 100644 --- a/src/sourcetree/sourcedelegate.cpp +++ b/src/sourcetree/sourcedelegate.cpp @@ -246,7 +246,7 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co painter->setFont( font ); textRect = itemsRect.adjusted( 0, 4, 0, 0 ); - painter->drawPixmap( textRect.x() + iconSpacing, textRect.y(), m_dropTypeImageMap.value( i ) ); + painter->drawPixmap( textRect.x() + iconSpacing, textRect.y(), m_dropTypeImageMap.value( i ).copy( 0, 0, 32, qMax( 4, textRect.height() ) ) ); int textSpacing = ( itemWidth - painter->fontMetrics().width( m_dropTypeTextMap.value( i ) ) ) / 2; textRect.adjust( textSpacing, 32 + 6, 0, 0 );