Fix selections problems (like flickering). Click on category select/deselects all...

[dolphin.git] / src / dolphincategorydrawer.cpp

diff --git a/src/dolphincategorydrawer.cpp b/src/dolphincategorydrawer.cpp
index 2479f2755044fe2ae277e553509dafb5c5eea077..42f55f47323eb2234154292af992c3467e5c86aa 100644 (file)
--- a/src/dolphincategorydrawer.cpp
+++ b/src/dolphincategorydrawer.cpp
@@ -62,7 +62,16 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
 
     const QString category = categoryVariant.toString();
 
-    QColor color = option.palette.color(QPalette::Text);
+    QColor color;
+
+    if (option.state & QStyle::State_Selected)
+    {
+        color = option.palette.color(QPalette::HighlightedText);
+    }
+    else
+    {
+        color = option.palette.color(QPalette::Text);
+    }
 
     painter->save();
     painter->setRenderHint(QPainter::Antialiasing);
@@ -74,7 +83,20 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
     opt.direction = option.direction;
     opt.text = category;
 
-    if (option.state & QStyle::State_MouseOver)
+    if (option.state & QStyle::State_Selected)
+    {
+        QColor selected = option.palette.color(QPalette::Highlight);
+
+        QLinearGradient gradient(option.rect.topLeft(),
+                                 option.rect.bottomRight());
+        gradient.setColorAt(option.direction == Qt::LeftToRight ? 0
+                                                                : 1, selected);
+        gradient.setColorAt(option.direction == Qt::LeftToRight ? 1
+                                                                : 0, Qt::transparent);
+
+        painter->fillRect(option.rect, gradient);
+    }
+    else if (option.state & QStyle::State_MouseOver)
     {
         QColor hover = option.palette.color(QPalette::Highlight).light();
         hover.setAlpha(88);
@@ -211,14 +233,12 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
                 if (option.direction == Qt::RightToLeft)
                 {
                     starRect.setLeft(starRect.left() + (iconSize / 2) /* separator between stars */);
-                    //starRect.setRight(starRect.right() + (iconSize / 2) /* separator between stars */);
                 }
 
                 starRect.setTop(option.rect.top() + (option.rect.height() / 2) - (iconSize / 4));
                 starRect.setSize(QSize(iconSize / 2, iconSize / 2));
                 painter->drawPixmap(starRect, smallPixmap);
                 starRect.setTop(opt.rect.top() + (option.rect.height() / 2) - (iconSize / 2));
-                //starRect.setSize(QSize(iconSize / 2, iconSize / 2));
 
                 if (option.direction == Qt::LeftToRight)
                 {
@@ -266,12 +286,16 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
 
     if (paintIcon) {
         painter->drawPixmap(QRect(option.direction == Qt::LeftToRight ? opt.rect.left()
-                                                                      : opt.rect.right() - iconSize, opt.rect.top(), iconSize, iconSize), icon);
+                                                                      : opt.rect.right() - iconSize + (iconSize / 4), opt.rect.top(), iconSize, iconSize), icon);
 
         if (option.direction == Qt::LeftToRight)
         {
             opt.rect.setLeft(opt.rect.left() + iconSize + (iconSize / 4));
         }
+        else
+        {
+            opt.rect.setRight(opt.rect.right() + (iconSize / 4));
+        }
     }
 
     if (paintText) {
@@ -283,8 +307,8 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole,
 
         if (option.direction == Qt::RightToLeft)
         {
-            textRect.setWidth(textRect.width() - (paintIcon ? iconSize + (iconSize / 4)
-                                                            : (iconSize / 4)));
+            textRect.setWidth(textRect.width() - (paintIcon ? iconSize + (iconSize / 2)
+                                                            : -(iconSize / 4)));
         }
 
         painter->drawText(textRect, Qt::AlignVCenter | Qt::AlignLeft,