Merge remote-tracking branch 'mixxx/2.4'

mixxxdj · Jan 20, 2024 · 7ab1844 · 7ab1844
2 parents e12415a + 5b1f477
commit 7ab1844
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
@@ -328,7 +328,7 @@
               <SizePolicy>min,me</SizePolicy>
               <Children>
                 <Template src="skins:Tango/mixer/vumeter_single.xml">
-                  <SetVariable name="group">[Master]</SetVariable>
+                  <SetVariable name="group">[Main]</SetVariable>
                 </Template>
                 <WidgetGroup><Size>0f,5f</Size></WidgetGroup>
                 <WidgetGroup>

diff --git a/src/library/stareditor.cpp b/src/library/stareditor.cpp
@@ -44,15 +44,23 @@ void StarEditor::paintEvent(QPaintEvent*) {
     m_styleOption.state |= QStyle::State_MouseOver;
     m_styleOption.rect = rect();
 
-    // 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;
+    if (selectionModel) {
+        // 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.
+        if (selectionModel->isSelected(m_index)) {
+            m_styleOption.state |= QStyle::State_Selected;
+        } else {
+            m_styleOption.state &= ~QStyle::State_Selected;
+        }
+        // Accordingly, un/set the focus flag.
+        if (selectionModel->currentIndex() == m_index) {
+            m_styleOption.state |= QStyle::State_HasFocus;
+        } else {
+            m_styleOption.state &= ~QStyle::State_HasFocus;
+        }
     }
 
     QPainter painter(this);
@@ -84,7 +92,7 @@ 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) {
+    if (m_styleOption.state & QStyle::State_HasFocus) {
         TableItemDelegate::drawBorder(&painter, m_pFocusBorderColor, m_styleOption.rect);
     }
 }