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

2 files changed, 12 insertions, 2 deletions

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 <qmmpui/playlistitem.h>
 #include <qmmpui/playlistmodel.h>
 #include <qmmpui/qmmpuisettings.h>
-//#include <qmmpui/playlistheadermodel.h>
 #include <qmmpui/playlistmanager.h>
 #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);
+                }
             }
         }
     }