mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-14 18:14:50 +02:00
Code Issues Releases Wiki Activity

* Only do the hover animation / controls when actually hovering the image.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-08-20 16:56:27 +02:00
parent b970a1d628
commit fc172279f2
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libtomahawk/playlist/GridItemDelegate.cpp
View File

@@ -310,21 +310,24 @@ GridItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
event->type() != QEvent::Leave ) event->type() != QEvent::Leave )
return false; return false;
const QMouseEvent* ev = static_cast< QMouseEvent* >( event );
bool hoveringArtist = false; bool hoveringArtist = false;
bool hoveringAlbum = false; bool hoveringAlbum = false;
if ( m_artistNameRects.contains( index ) ) if ( m_artistNameRects.contains( index ) )
{ {
const QRect artistNameRect = m_artistNameRects[ index ]; const QRect artistNameRect = m_artistNameRects[ index ];
const QMouseEvent* ev = static_cast< QMouseEvent* >( event );
hoveringArtist = artistNameRect.contains( ev->pos() ); hoveringArtist = artistNameRect.contains( ev->pos() );
} }
if ( m_albumNameRects.contains( index ) ) if ( m_albumNameRects.contains( index ) )
{ {
const QRect albumNameRect = m_albumNameRects[ index ]; const QRect albumNameRect = m_albumNameRects[ index ];
const QMouseEvent* ev = static_cast< QMouseEvent* >( event );
hoveringAlbum = albumNameRect.contains( ev->pos() ); hoveringAlbum = albumNameRect.contains( ev->pos() );
} }
QRect coverRect = m_view->visualRect( index );
coverRect.setHeight( coverRect.width() );
const bool hoveringCover = coverRect.contains( ev->pos() );
if ( event->type() == QEvent::MouseMove ) if ( event->type() == QEvent::MouseMove )
{ {
if ( hoveringArtist || hoveringAlbum ) if ( hoveringArtist || hoveringAlbum )
@@ -338,7 +341,7 @@ GridItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
m_hoverControls.take( idx )->deleteLater(); m_hoverControls.take( idx )->deleteLater();
} }
if ( !m_hoverControls.contains( index ) && !m_spinner.contains( index ) ) if ( hoveringCover && !m_hoverControls.contains( index ) && !m_spinner.contains( index ) )
{ {
foreach ( HoverControls* control, m_hoverControls ) foreach ( HoverControls* control, m_hoverControls )
control->deleteLater(); control->deleteLater();
@@ -406,7 +409,10 @@ GridItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
fadeOut->start(); fadeOut->start();
} }
emit updateIndex( m_hoverIndex ); emit updateIndex( m_hoverIndex );
}
if ( hoveringCover && m_hoverIndex != index )
{
m_hoverIndex = index; m_hoverIndex = index;
int startFrame = 0; int startFrame = 0;
if ( m_hoverFaders.contains( index ) ) if ( m_hoverFaders.contains( index ) )
@@ -427,6 +433,8 @@ GridItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
emit updateIndex( index ); emit updateIndex( index );
} }
else if ( !hoveringCover )
resetHoverIndex();
event->accept(); event->accept();
return true; return true;