mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 13:47:26 +02:00
Code Issues Releases Wiki Activity

Shorten description if we have remove btn and config wrench

Browse Source
This commit is contained in:
Uwe L. Korn
2014-06-11 10:54:36 +01:00
parent 4b11e1923d
commit c9d1d2fb7a
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libtomahawk/accounts/AccountDelegate.cpp
View File

@@ -249,7 +249,7 @@ AccountDelegate::paint ( QPainter* painter, const QStyleOptionViewItem& option,
else if ( canDelete ) else if ( canDelete )
{ {
const QString btnText = tr( "Remove" ); const QString btnText = tr( "Remove" );
const int btnWidth = installMetrics.width( btnText ) + 2*PADDING; const int btnWidth = removeBtnWidth( opt );
QRect btnRect = QRect( opt.rect.right() - 3 * PADDING - btnWidth, QRect btnRect = QRect( opt.rect.right() - 3 * PADDING - btnWidth,
center - installMetrics.height() / 2 - PADDING, center - installMetrics.height() / 2 - PADDING,
@@ -311,7 +311,9 @@ AccountDelegate::paint ( QPainter* painter, const QStyleOptionViewItem& option,
} }
// description // description
const int descWidth = rightEdge - leftTitleEdge - PADDING; int descWidth = rightEdge - leftTitleEdge - PADDING;
if ( canDelete )
descWidth -= removeBtnWidth( opt ) + PADDING;
painter->setFont( descFont ); painter->setFont( descFont );
const QRect descRect( leftTitleEdge, runningBottom + PADDING, descWidth, painter->fontMetrics().height() ); const QRect descRect( leftTitleEdge, runningBottom + PADDING, descWidth, painter->fontMetrics().height() );
desc = painter->fontMetrics().elidedText( desc, Qt::ElideRight, descWidth ); desc = painter->fontMetrics().elidedText( desc, Qt::ElideRight, descWidth );
@@ -659,6 +661,17 @@ AccountDelegate::checkRectForIndex( const QStyleOptionViewItem& option, const QM
} }
int
AccountDelegate::removeBtnWidth( QStyleOptionViewItemV4 opt ) const
{
const QString btnText = tr( "Remove" );
QFont font = opt.font;
font.setItalic( false );
return QFontMetrics( font ).width( btnText ) + 2*PADDING;
}
void void
AccountDelegate::startInstalling( const QPersistentModelIndex& idx ) AccountDelegate::startInstalling( const QPersistentModelIndex& idx )
{ {

2
src/libtomahawk/accounts/AccountDelegate.h
View File

@@ -78,6 +78,8 @@ private:
QRect checkRectForIndex( const QStyleOptionViewItem &option, const QModelIndex &idx ) const; QRect checkRectForIndex( const QStyleOptionViewItem &option, const QModelIndex &idx ) const;
int removeBtnWidth( QStyleOptionViewItemV4 opt ) const;
int m_hoveringOver; int m_hoveringOver;
QPersistentModelIndex m_hoveringItem, m_configPressed; QPersistentModelIndex m_hoveringItem, m_configPressed;
mutable QHash< QPersistentModelIndex, QRect > m_cachedButtonRects; mutable QHash< QPersistentModelIndex, QRect > m_cachedButtonRects;