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

* GridItemDelegate can now display the item's position.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-09-26 08:06:23 +02:00
parent 27d20e0395
commit fa568c883e
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,7 @@ GridItemDelegate::GridItemDelegate( QAbstractItemView* parent, PlayableProxyMode
: QStyledItemDelegate( (QObject*)parent ) : QStyledItemDelegate( (QObject*)parent )
, m_view( parent ) , m_view( parent )
, m_model( proxy ) , m_model( proxy )
, m_showPosition( false )
, m_margin( TomahawkUtils::DpiScaler::scaledY( parent, 32 ) ) , m_margin( TomahawkUtils::DpiScaler::scaledY( parent, 32 ) )
{ {
if ( m_view && m_view->metaObject()->indexOfSignal( "modelChanged()" ) > -1 ) if ( m_view && m_view->metaObject()->indexOfSignal( "modelChanged()" ) > -1 )
@@ -82,6 +83,13 @@ GridItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelInde
} }
void
GridItemDelegate::setShowPosition( bool enabled )
{
m_showPosition = enabled;
}
void void
GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
{ {
@@ -187,7 +195,7 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
QFont smallFont = font; QFont smallFont = font;
smallFont.setPointSize( TomahawkUtils::defaultFontSize() ); smallFont.setPointSize( TomahawkUtils::defaultFontSize() );
QRect textRect = option.rect.adjusted( 0, r.height() + m_margin / 4, 0, 0 ); QRect textRect = option.rect.adjusted( 0, r.height() + m_margin / 4, 0, -m_margin / 2 + m_margin / 8 );
bool oneLiner = false; bool oneLiner = false;
if ( bottom.isEmpty() ) if ( bottom.isEmpty() )
oneLiner = true; oneLiner = true;
@@ -196,6 +204,25 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
painter->setFont( font ); painter->setFont( font );
painter->setPen( Qt::black ); painter->setPen( Qt::black );
painter->setOpacity( 0.8 ); painter->setOpacity( 0.8 );
if ( m_showPosition )
{
painter->save();
if ( !oneLiner )
{
QFont figFont = font;
figFont.setPixelSize( textRect.height() - m_margin / 8 );
painter->setFont( figFont );
}
const QString fig = QString::number( index.row() + 1 );
painter->drawText( textRect, fig, QTextOption( Qt::AlignLeft | Qt::AlignTop ) );
textRect.adjust( painter->fontMetrics().boundingRect( textRect, Qt::AlignLeft | Qt::AlignTop, fig ).width() + m_margin / 4, 0, 0, 0 );
painter->restore();
}
if ( oneLiner ) if ( oneLiner )
{ {
// If the user is hovering over an artist rect, draw a background so they knows it's clickable // If the user is hovering over an artist rect, draw a background so they knows it's clickable
@@ -207,7 +234,7 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
} }
to.setAlignment( Qt::AlignLeft | Qt::AlignTop ); to.setAlignment( Qt::AlignLeft | Qt::AlignTop );
text = painter->fontMetrics().elidedText( top, Qt::ElideRight, textRect.width() - m_margin / 8 ); text = painter->fontMetrics().elidedText( top, Qt::ElideRight, textRect.width() - m_margin / 4 );
painter->drawText( textRect, text, to ); painter->drawText( textRect, text, to );
// Calculate rect of artist on-hover button click area // Calculate rect of artist on-hover button click area
@@ -225,7 +252,7 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
} }
to.setAlignment( Qt::AlignLeft | Qt::AlignTop ); to.setAlignment( Qt::AlignLeft | Qt::AlignTop );
text = painter->fontMetrics().elidedText( top, Qt::ElideRight, textRect.width() - m_margin / 8 ); text = painter->fontMetrics().elidedText( top, Qt::ElideRight, textRect.width() - m_margin / 4 );
painter->drawText( textRect, text, to ); painter->drawText( textRect, text, to );
if ( item->album() ) if ( item->album() )
@@ -246,13 +273,13 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
painter->setFont( f ); painter->setFont( f );
} }
textRect.adjust( 0, m_margin / 16, 0, m_margin / 16 ); textRect.adjust( 0, painter->fontMetrics().height() + m_margin / 16, 0, 0 );
to.setAlignment( Qt::AlignLeft | Qt::AlignVCenter ); to.setAlignment( Qt::AlignLeft | Qt::AlignBottom );
text = painter->fontMetrics().elidedText( bottom, Qt::ElideRight, textRect.width() - m_margin / 8 ); text = painter->fontMetrics().elidedText( bottom, Qt::ElideRight, textRect.width() - m_margin / 4 );
painter->drawText( textRect, text, to ); painter->drawText( textRect, text, to );
// Calculate rect of artist on-hover button click area // Calculate rect of artist on-hover button click area
m_artistNameRects[ index ] = painter->fontMetrics().boundingRect( textRect, Qt::AlignLeft | Qt::AlignVCenter, text ); m_artistNameRects[ index ] = painter->fontMetrics().boundingRect( textRect, Qt::AlignLeft | Qt::AlignBottom, text );
} }
painter->restore(); painter->restore();

2
src/libtomahawk/playlist/GridItemDelegate.h
View File

@@ -51,6 +51,7 @@ public:
public slots: public slots:
void resetHoverIndex(); void resetHoverIndex();
void setShowPosition( bool enabled );
protected: protected:
void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
@@ -87,6 +88,7 @@ private:
QAbstractItemView* m_view; QAbstractItemView* m_view;
PlayableProxyModel* m_model; PlayableProxyModel* m_model;
QSize m_itemSize; QSize m_itemSize;
bool m_showPosition;
mutable QHash< QPersistentModelIndex, QRect > m_artistNameRects; mutable QHash< QPersistentModelIndex, QRect > m_artistNameRects;
mutable QHash< QPersistentModelIndex, QRect > m_albumNameRects; mutable QHash< QPersistentModelIndex, QRect > m_albumNameRects;