1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00

Fix offset querylabel due to wrong fontmetrics

This commit is contained in:
Leo Franchi
2011-10-31 17:15:52 -04:00
parent 7ab68fb418
commit c82845d22a

View File

@@ -352,18 +352,23 @@ QueryLabel::paintEvent( QPaintEvent* event )
QString s = text(); QString s = text();
const QString elidedText = fontMetrics().elidedText( s, m_mode, r.width() ); const QString elidedText = fontMetrics().elidedText( s, m_mode, r.width() );
qDebug() << "ELIDED TEXT:" << elidedText << "orig:" << s;
p.save(); p.save();
p.setRenderHint( QPainter::Antialiasing ); p.setRenderHint( QPainter::Antialiasing );
QFontMetrics fm = fontMetrics();
if ( m_useCustomFont ) if ( m_useCustomFont )
{
p.setFont( m_font ); p.setFont( m_font );
fm = QFontMetrics( m_font );
}
if ( m_hoverArea.width() ) if ( m_hoverArea.width() )
{ {
if ( elidedText != s ) if ( elidedText != s )
{ {
m_hoverArea.setLeft( 0 ); m_hoverArea.setLeft( 0 );
m_hoverArea.setRight( fontMetrics().width( elidedText ) + contentsMargins().left() * 2 ); m_hoverArea.setRight( fm.width( elidedText ) + contentsMargins().left() * 2 );
m_hoverType = Track; m_hoverType = Track;
} }
@@ -386,7 +391,6 @@ QueryLabel::paintEvent( QPaintEvent* event )
} }
else else
{ {
const QFontMetrics& fm = fontMetrics();
int dashX = fm.width( DASH ); int dashX = fm.width( DASH );
int artistX = m_type & Artist ? fm.width( artist() ) : 0; int artistX = m_type & Artist ? fm.width( artist() ) : 0;
int albumX = m_type & Album ? fm.width( album() ) : 0; int albumX = m_type & Album ? fm.width( album() ) : 0;