diff options
| -rw-r--r-- | src/plugins/Ui/skinned/listwidget.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/listwidgetdrawer.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/listwidgetdrawer.h | 11 |
3 files changed, 2 insertions, 17 deletions
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp index 5c2ea79e3..96e74dd29 100644 --- a/src/plugins/Ui/skinned/listwidget.cpp +++ b/src/plugins/Ui/skinned/listwidget.cpp @@ -367,16 +367,12 @@ void ListWidget::updateList(int flags) i == (m_anchor_index - m_first) ? row->flags |= ListWidgetRow::ANCHOR : row->flags &= ~ListWidgetRow::ANCHOR; - row->selected = items[i]->isSelected(); - if(flags == PlayListModel::SELECTION) continue; - row->bgY = i * (m_metrics->lineSpacing() + 1); row->textY = i * (m_metrics->lineSpacing() + 1) + m_metrics->lineSpacing() - m_metrics->descent(); row->rect = QRect(5, i * (m_metrics->lineSpacing() + 1), width() - 10, m_metrics->lineSpacing()); row->title = items[i]->formattedTitle(); - row->current = (m_first + i) == m_model->currentIndex(); (m_first + i) == m_model->currentIndex() ? row->flags |= ListWidgetRow::CURRENT : row->flags &= ~ListWidgetRow::CURRENT; @@ -384,7 +380,6 @@ void ListWidget::updateList(int flags) if(items[i]->isGroup()) { row->flags |= ListWidgetRow::GROUP; - row->separator = true; row->number = 0; row->length.clear(); row->title = m_metrics->elidedText (row->title, Qt::ElideRight, @@ -393,7 +388,6 @@ void ListWidget::updateList(int flags) else { row->flags &= ~ListWidgetRow::GROUP; - row->separator = false; //optimization: reduces number of PlaListModel::numberOfTrack(int) calls if(!prev_number) { diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp index 3a2e15edb..d6a9c5918 100644 --- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp +++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp @@ -119,7 +119,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, int m_number_width, ListWidg { int sx = 0; - painter->setPen(row->current ? m_current : m_normal); + painter->setPen(row->flags & ListWidgetRow::CURRENT ? m_current : m_normal); if(m_number_width) { diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.h b/src/plugins/Ui/skinned/listwidgetdrawer.h index 717401d1b..da0788b3c 100644 --- a/src/plugins/Ui/skinned/listwidgetdrawer.h +++ b/src/plugins/Ui/skinned/listwidgetdrawer.h @@ -49,18 +49,9 @@ struct ListWidgetRow }; int flags; - - - //geometry - QRect rect; - - + QRect rect; //geometry //TODO remove - bool separator; - bool selected; - bool current; - int bgY; //top of the background int textY; //base line of the text }; |