mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-12 00:54:20 +02:00
* Fixed JobStatusDelegate's font calculations and made sure it never wraps.
This commit is contained in:
@@ -49,7 +49,7 @@ JobStatusDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
|
|||||||
{
|
{
|
||||||
QStyleOptionViewItemV4 opt = option;
|
QStyleOptionViewItemV4 opt = option;
|
||||||
initStyleOption( &opt, index );
|
initStyleOption( &opt, index );
|
||||||
QFontMetrics fm( opt.font );
|
QFontMetrics fm( painter->font() );
|
||||||
const bool allowMultiLine = index.data( JobStatusModel::AllowMultiLineRole ).toBool();
|
const bool allowMultiLine = index.data( JobStatusModel::AllowMultiLineRole ).toBool();
|
||||||
|
|
||||||
opt.state &= ~QStyle::State_MouseOver;
|
opt.state &= ~QStyle::State_MouseOver;
|
||||||
@@ -84,7 +84,10 @@ JobStatusDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
|
|||||||
QString mainText = index.data( Qt::DisplayRole ).toString();
|
QString mainText = index.data( Qt::DisplayRole ).toString();
|
||||||
QTextOption to( Qt::AlignLeft | Qt::AlignVCenter );
|
QTextOption to( Qt::AlignLeft | Qt::AlignVCenter );
|
||||||
if ( !allowMultiLine )
|
if ( !allowMultiLine )
|
||||||
|
{
|
||||||
|
to.setWrapMode( QTextOption::NoWrap );
|
||||||
mainText = fm.elidedText( mainText, Qt::ElideRight, mainW );
|
mainText = fm.elidedText( mainText, Qt::ElideRight, mainW );
|
||||||
|
}
|
||||||
else
|
else
|
||||||
to.setWrapMode( QTextOption::WrapAtWordBoundaryOrAnywhere );
|
to.setWrapMode( QTextOption::WrapAtWordBoundaryOrAnywhere );
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user