Merge remote-tracking branch 'mixxx/2.4'

src/library/stardelegate.cpp

@@ -18,7 +18,8 @@ void StarDelegate::paintItem(
         QPainter* painter,
         const QStyleOptionViewItem& option,
         const QModelIndex& index) const {
-    // let the editor do the painting if this cell is currently being edited
+    // Let the editor do the painting if this cell is currently being edited.
+    // Note: if required, the focus border will be drawn by the editor.
     if (index == m_currentEditedCellIndex) {
         return;
     }

src/library/stareditor.cpp

@@ -47,9 +47,12 @@ void StarEditor::paintEvent(QPaintEvent*) {
     // If the editor cell is selected set the respective flag so we can use the
     // palette's 'HighlightedText' font color for the brush StarRating will use
     // to fill the star/diamond polygons with.
+    // Else, unset it and we use the regular color.
     QItemSelectionModel* selectionModel = m_pTableView->selectionModel();
     if (selectionModel && selectionModel->isSelected(m_index)) {
         m_styleOption.state |= QStyle::State_Selected;
+    } else {
+        m_styleOption.state &= ~QStyle::State_Selected;
     }
 
     QPainter painter(this);
@@ -62,13 +65,6 @@ void StarEditor::paintEvent(QPaintEvent*) {
         style->drawControl(QStyle::CE_ItemViewItem, &m_styleOption, &painter, m_pTableView);
     }
 
-    // Draw a border if the color cell has focus
-    if (m_styleOption.state & QStyle::State_Selected) {
-        // QPainterScope in drawBorder() and shift down?
-        TableItemDelegate::drawBorder(&painter, m_pFocusBorderColor, m_styleOption.rect);
-    }
-
-    // Starrating scales the painter so do this after painting the border.
     // Set the palette appropriately based on whether the row is selected or
     // not. We also have to check if it is inactive or not and use the
     // appropriate ColorGroup.
@@ -86,6 +82,11 @@ void StarEditor::paintEvent(QPaintEvent*) {
     }
 
     m_starRating.paint(&painter, m_styleOption.rect);
+
+    // Draw a border if the color cell is selected
+    if (m_styleOption.state & QStyle::State_Selected) {
+        TableItemDelegate::drawBorder(&painter, m_pFocusBorderColor, m_styleOption.rect);
+    }
 }
 
 bool StarEditor::eventFilter(QObject* obj, QEvent* event) {

src/library/starrating.cpp

@@ -37,6 +37,7 @@ void StarRating::paint(QPainter* painter, const QRect& rect) const {
     PainterScope painterScope(painter);
     // Assume the painter is configured with the right brush.
     painter->setRenderHint(QPainter::Antialiasing, true);
+    // Don't draw outlines, only fill the polygons
     painter->setPen(Qt::NoPen);
 
     // Center vertically inside the table cell, and also center horizontally

src/widget/wstarrating.cpp

@@ -35,10 +35,7 @@ void WStarRating::setup(const QDomNode& node, const SkinContext& context) {
 }
 
 QSize WStarRating::sizeHint() const {
-    QStyleOption option;
-    option.initFrom(this);
-
-    // Center rating horizontally
+    // Center rating horizontally and vertically
     m_contentRect.setRect(
             (size().width() - m_visualStarRating.sizeHint().width()) / 2,
             (size().height() - m_visualStarRating.sizeHint().height()) / 2,