skinned: fixed selected track color

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

2 files changed, 51 insertions, 40 deletions

diff --git a/src/plugins/Ui/skinned/forms/skinnedsettings.ui b/src/plugins/Ui/skinned/forms/skinnedsettings.ui
index c3e98b280..706b65609 100644
--- a/src/plugins/Ui/skinned/forms/skinnedsettings.ui
+++ b/src/plugins/Ui/skinned/forms/skinnedsettings.ui
@@ -1055,12 +1055,12 @@
    <slot>setNum(int)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>385</x>
-     <y>284</y>
+     <x>433</x>
+     <y>236</y>
     </hint>
     <hint type="destinationlabel">
-     <x>393</x>
-     <y>283</y>
+     <x>464</x>
+     <y>236</y>
     </hint>
    </hints>
   </connection>
@@ -1071,12 +1071,12 @@
    <slot>setNum(int)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>385</x>
-     <y>310</y>
+     <x>433</x>
+     <y>262</y>
     </hint>
     <hint type="destinationlabel">
-     <x>416</x>
-     <y>310</y>
+     <x>464</x>
+     <y>262</y>
     </hint>
    </hints>
   </connection>
@@ -1087,12 +1087,12 @@
    <slot>setNum(int)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>373</x>
-     <y>334</y>
+     <x>433</x>
+     <y>288</y>
     </hint>
     <hint type="destinationlabel">
-     <x>395</x>
-     <y>334</y>
+     <x>464</x>
+     <y>288</y>
     </hint>
    </hints>
   </connection>
@@ -1103,12 +1103,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>172</x>
-     <y>238</y>
+     <x>182</x>
+     <y>398</y>
     </hint>
     <hint type="destinationlabel">
-     <x>117</x>
-     <y>270</y>
+     <x>128</x>
+     <y>439</y>
     </hint>
    </hints>
   </connection>
@@ -1119,12 +1119,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>148</x>
-     <y>103</y>
+     <x>166</x>
+     <y>98</y>
     </hint>
     <hint type="destinationlabel">
-     <x>151</x>
-     <y>118</y>
+     <x>169</x>
+     <y>154</y>
     </hint>
    </hints>
   </connection>
@@ -1135,12 +1135,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>201</x>
-     <y>161</y>
+     <x>211</x>
+     <y>246</y>
     </hint>
     <hint type="destinationlabel">
-     <x>266</x>
-     <y>215</y>
+     <x>263</x>
+     <y>369</y>
     </hint>
    </hints>
   </connection>
@@ -1151,12 +1151,28 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>95</x>
-     <y>162</y>
+     <x>105</x>
+     <y>246</y>
     </hint>
     <hint type="destinationlabel">
-     <x>95</x>
-     <y>181</y>
+     <x>105</x>
+     <y>330</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>plSkinColorsCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>widget_2</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>109</x>
+     <y>85</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>133</x>
+     <y>105</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
index 00cbe498b..aa7065113 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
@@ -338,12 +338,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
     bool draw_extra = false;
 
     painter->setFont(m_font);
-    QColor textColor = m_normal;
-
-    if(row->flags & ListWidgetRow::CURRENT)
-        textColor = m_current;
-    //else if(row->flags & ListWidgetRow::SELECTED)
-    //    textColor = m_normal;
+    QColor textColor = row->flags & ListWidgetRow::CURRENT ? m_current : m_normal;
 
     painter->setPen(textColor);
 
@@ -361,12 +356,12 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
                 {
                     painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
                     painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1);
-                    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+                    painter->setPen(textColor);
                 }
             }
 
             sx -= m_metrics->horizontalAdvance(row->titles[0]);
-            painter->setPen(row->flags & ListWidgetRow::CURRENT ? m_current : m_normal);
+            painter->setPen(textColor);
             painter->drawText(sx - m_padding, sy, row->titles[0]);
 
             sx = row->rect.x() + m_padding;
@@ -388,7 +383,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
         {
             for(int i = 0; i < row->sizes.count(); i++)
             {
-                painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+                painter->setPen(textColor);
                 draw_extra = (i == row->trackStateColumn && !row->extraString.isEmpty());
 
                 if(row->alignment[i] == ListWidgetRow::ALIGN_LEFT)
@@ -442,11 +437,11 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
                 {
                     painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
                     painter->drawLine(sx, row->rect.top(), sx, row->rect.bottom() + 1);
-                    painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+                    painter->setPen(textColor);
                 }
             }
 
-            painter->setPen(row->flags & ListWidgetRow::CURRENT ? m_current : m_normal);
+            painter->setPen(textColor);
             painter->drawText(sx + m_padding, sy, row->titles[0]);
 
             sx = row->rect.right() - m_padding;
@@ -469,7 +464,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
         {
             for(int i = 0; i < row->sizes.count(); i++)
             {
-                painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : textColor);
+                painter->setPen(textColor);
                 draw_extra = (i == row->trackStateColumn && !row->extraString.isEmpty());
 
                 if(row->alignment[i] == ListWidgetRow::ALIGN_LEFT)