skinned: fixed track number

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5226 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index 2f950ca6b..976649fa6 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -363,13 +363,13 @@ void ListWidget::updateList(int flags)
         if(items[i]->isGroup())
         {
             row->flags |= ListWidgetRow::GROUP;
-            row->trackIndex = -1;
+            row->number = -1;
             row->length.clear();
         }
         else
         {
             row->flags &= ~ListWidgetRow::GROUP;
-            row->trackIndex = items.at(i)->trackIndex();
+            row->number = items.at(i)->trackIndex() + 1;
             row->length = items[i]->formattedLength();
             row->extraString = getExtraString(m_first + i);
         }
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
index 5c9545c9c..2a4aa0cc8 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
@@ -125,7 +125,7 @@ void ListWidgetDrawer::prepareRow(ListWidgetRow *row)
     if(row->titles.count() == 1)
     {
         if(m_show_number && !m_align_numbers)
-            row->titles[0].prepend(QString("%1").arg(row->trackIndex)+". ");
+            row->titles[0].prepend(QString("%1").arg(row->number)+". ");
 
         if((m_show_lengths && !row->length.isEmpty()) || !row->extraString.isEmpty())
             row->lengthColumnWidth = m_padding;
@@ -254,7 +254,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
             {
                 sx -= row->numberColumnWidth;
                 painter->setPen(row->flags & ListWidgetRow::CURRENT ? m_current : m_normal);
-                QString number = QString("%1").arg(row->trackIndex);
+                QString number = QString("%1").arg(row->number);
                 painter->drawText(sx + m_padding, sy, number);
                 painter->setPen(m_normal);
                 painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1);
@@ -308,7 +308,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
             {
                 sx += row->numberColumnWidth;
                 painter->setPen(row->flags & ListWidgetRow::CURRENT ? m_current : m_normal);
-                QString number = QString("%1").arg(row->trackIndex);
+                QString number = QString("%1").arg(row->number);
                 painter->drawText(sx - m_padding - m_metrics->width(number), sy, number);
                 painter->setPen(m_normal);
                 painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1);
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.h b/src/plugins/Ui/skinned/listwidgetdrawer.h
index 88d65d6f6..c2081e44d 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.h
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.h
@@ -40,13 +40,13 @@ struct ListWidgetRow
         numberColumnWidth = 0;
         lengthColumnWidth = 0;
         trackStateColumn = -1;
-        trackIndex = -1;
+        number = -1;
     }
     QStringList titles;
     QList<int> sizes;
     QString length;
     QString extraString;
-    int trackIndex;
+    int number;
     int numberColumnWidth;
     int lengthColumnWidth;
     int trackStateColumn;