mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 03:40:16 +02:00
Code Issues Releases Wiki Activity

* Prepared QueryLabel for queries without an album name.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-12-09 09:36:04 +01:00
parent 1fd8221181
commit f95f40f73b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libtomahawk/widgets/QueryLabel.cpp
View File

@@ -110,7 +110,7 @@ QueryLabel::text() const
{ {
text += m_result->artist()->name(); text += m_result->artist()->name();
} }
if ( m_type & Album ) if ( m_type & Album && !m_result->album()->name().isEmpty() )
{ {
smartAppend( text, m_result->album()->name() ); smartAppend( text, m_result->album()->name() );
} }
@@ -125,7 +125,7 @@ QueryLabel::text() const
{ {
text += m_query->artist(); text += m_query->artist();
} }
if ( m_type & Album ) if ( m_type & Album && !m_query->album().isEmpty() )
{ {
smartAppend( text, m_query->album() ); smartAppend( text, m_query->album() );
} }
@@ -429,7 +429,7 @@ QueryLabel::paintEvent( QPaintEvent* event )
p.drawText( r, m_align, artist()->name() ); p.drawText( r, m_align, artist()->name() );
r.adjust( artistX, 0, 0, 0 ); r.adjust( artistX, 0, 0, 0 );
} }
if ( m_type & Album ) if ( m_type & Album && !album()->name().isEmpty() )
{ {
p.setBrush( palette().window() ); p.setBrush( palette().window() );
if ( !m_useCustomPen ) if ( !m_useCustomPen )
@@ -455,7 +455,7 @@ QueryLabel::paintEvent( QPaintEvent* event )
if ( !m_useCustomPen ) if ( !m_useCustomPen )
p.setPen( palette().color( foregroundRole() ) ); p.setPen( palette().color( foregroundRole() ) );
if ( m_type & Artist || m_type & Album ) if ( m_type & Artist || ( m_type & Album && !album()->name().isEmpty() ) )
{ {
p.drawText( r, m_align, DASH ); p.drawText( r, m_align, DASH );
r.adjust( dashX, 0, 0, 0 ); r.adjust( dashX, 0, 0, 0 );
@@ -597,7 +597,7 @@ QueryLabel::mouseMoveEvent( QMouseEvent* event )
{ {
trackX += contentsMargins().left(); trackX += contentsMargins().left();
} }
if ( m_type & Album ) if ( m_type & Album && !album()->name().isEmpty() )
{ {
trackX += albumX + dashX; trackX += albumX + dashX;
albumX += contentsMargins().left(); albumX += contentsMargins().left();
@@ -620,7 +620,7 @@ QueryLabel::mouseMoveEvent( QMouseEvent* event )
hoverArea.setLeft( 0 ); hoverArea.setLeft( 0 );
hoverArea.setRight( artistX + contentsMargins().left() - 1 ); hoverArea.setRight( artistX + contentsMargins().left() - 1 );
} }
else if ( m_type & Album && x < albumX && x > artistX ) else if ( m_type & Album && !album()->name().isEmpty() && x < albumX && x > artistX )
{ {
m_hoverType = Album; m_hoverType = Album;
int spacing = ( m_type & Artist ) ? dashX : 0; int spacing = ( m_type & Artist ) ? dashX : 0;
@@ -630,7 +630,7 @@ QueryLabel::mouseMoveEvent( QMouseEvent* event )
else if ( m_type & Track && x < trackX && x > albumX ) else if ( m_type & Track && x < trackX && x > albumX )
{ {
m_hoverType = Track; m_hoverType = Track;
int spacing = ( m_type & Album ) ? dashX : 0; int spacing = ( m_type & Album && !album()->name().isEmpty() ) ? dashX : 0;
hoverArea.setLeft( albumX + spacing ); hoverArea.setLeft( albumX + spacing );
hoverArea.setRight( trackX + contentsMargins().left() - 1 ); hoverArea.setRight( trackX + contentsMargins().left() - 1 );
} }