From eb0064e40886328f3b3d9a809abd61c804903a7f Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 29 Jun 2015 11:38:45 +0000 Subject: skinned: fixed extra string output git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5187 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/skinned/listwidget.cpp | 1 - src/plugins/Ui/skinned/listwidgetdrawer.cpp | 13 ++++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp index 0d979e3d2..1688e0cdb 100644 --- a/src/plugins/Ui/skinned/listwidget.cpp +++ b/src/plugins/Ui/skinned/listwidget.cpp @@ -31,7 +31,6 @@ #include #include #include -//#include #include #include "listwidget.h" #include "playlistheader.h" diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp index 5856bd4b1..389d97433 100644 --- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp +++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp @@ -156,7 +156,11 @@ void ListWidgetDrawer::prepareRow(ListWidgetRow *row) for(int i = 0; i < row->titles.count(); ++i) { int size = row->sizes[i]; - row->titles[i] = m_metrics->elidedText (row->titles[i], Qt::ElideRight, size - 2 * m_padding); + if(i == 0 && !row->extraString.isEmpty()) + row->titles[i] = m_metrics->elidedText (row->titles[i], Qt::ElideRight, + size - 3 * m_padding - m_extra_metrics->width(row->extraString)); + else + row->titles[i] = m_metrics->elidedText (row->titles[i], Qt::ElideRight, size - 2 * m_padding); visible_width -= size; } } @@ -328,6 +332,13 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl sx += row->sizes[i]; painter->setPen(m_normal); painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1); + if(i == 0 && !row->extraString.isEmpty()) + { + painter->setFont(m_extra_font); + painter->drawText(sx - m_padding - m_extra_metrics->width(row->extraString), + sy, row->extraString); + painter->setFont(m_font); + } } } } -- cgit v1.2.3-13-gbd6f