Fix selection rect after porting from QFontMetrics::width()

[dolphin.git] / src / kitemviews / kitemlistgroupheader.cpp

diff --git a/src/kitemviews/kitemlistgroupheader.cpp b/src/kitemviews/kitemlistgroupheader.cpp
index 576d20b881d45144b8cd5c8085605101f9b7f6b6..0c495693cb6317c632dc29fcb8844b9e72190e6c 100644 (file)
--- a/src/kitemviews/kitemlistgroupheader.cpp
+++ b/src/kitemviews/kitemlistgroupheader.cpp
@@ -1,8 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *                                                                         *
 /***************************************************************************
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *                                                                         *

- *   Based on the Itemviews NG project from Trolltech Labs:                *
- *   http://qt.gitorious.org/qt-labs/itemviews-ng                          *
+ *   Based on the Itemviews NG project from Trolltech Labs                 *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -27,10 +26,9 @@
 #include <QGraphicsSceneResizeEvent>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
 #include <QGraphicsSceneResizeEvent>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>

-#include <KDebug>

 
 KItemListGroupHeader::KItemListGroupHeader(QGraphicsWidget* parent) :
 
 KItemListGroupHeader::KItemListGroupHeader(QGraphicsWidget* parent) :

-    QGraphicsWidget(parent, 0),
+    QGraphicsWidget(parent),

     m_dirtyCache(true),
     m_role(),
     m_data(),
     m_dirtyCache(true),
     m_role(),
     m_data(),


@@ -79,6 +77,10 @@ QVariant KItemListGroupHeader::data() const
 
 void KItemListGroupHeader::setStyleOption(const KItemListStyleOption& option)
 {
 
 void KItemListGroupHeader::setStyleOption(const KItemListStyleOption& option)
 {

+    if (m_styleOption == option) {
+        return;
+    }
+

     const KItemListStyleOption previous = m_styleOption;
     m_styleOption = option;
     m_dirtyCache = true;
     const KItemListStyleOption previous = m_styleOption;
     m_styleOption = option;
     m_dirtyCache = true;


@@ -124,9 +126,9 @@ Qt::Orientation KItemListGroupHeader::scrollOrientation() const
 
 void KItemListGroupHeader::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
 
 void KItemListGroupHeader::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {

-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)

 
     if (m_dirtyCache) {
         updateCache();
 
     if (m_dirtyCache) {
         updateCache();


@@ -138,32 +140,32 @@ void KItemListGroupHeader::paint(QPainter* painter, const QStyleOptionGraphicsIt
 
 void KItemListGroupHeader::roleChanged(const QByteArray& current, const QByteArray& previous)
 {
 
 void KItemListGroupHeader::roleChanged(const QByteArray& current, const QByteArray& previous)
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)

 }
 
 void KItemListGroupHeader::dataChanged(const QVariant& current, const QVariant& previous)
 {
 }
 
 void KItemListGroupHeader::dataChanged(const QVariant& current, const QVariant& previous)
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)

 }
 
 void KItemListGroupHeader::styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous)
 {
 }
 
 void KItemListGroupHeader::styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous)
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)

 }
 
 void KItemListGroupHeader::scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous)
 {
 }
 
 void KItemListGroupHeader::scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous)
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)

 }
 
 void KItemListGroupHeader::itemIndexChanged(int current, int previous)
 {
 }
 
 void KItemListGroupHeader::itemIndexChanged(int current, int previous)
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)

 }
 
 void KItemListGroupHeader::resizeEvent(QGraphicsSceneResizeEvent* event)
 }
 
 void KItemListGroupHeader::resizeEvent(QGraphicsSceneResizeEvent* event)


@@ -180,10 +182,10 @@ void KItemListGroupHeader::updateCache()
 
     // Calculate the role- and line-color. No alphablending is used for
     // performance reasons.
 
     // Calculate the role- and line-color. No alphablending is used for
     // performance reasons.

-    const QColor c1 = m_styleOption.palette.text().color();
-    const QColor c2 = m_styleOption.palette.base().color();
+    const QColor c1 = textColor();
+    const QColor c2 = baseColor();

     m_separatorColor = mixedColor(c1, c2, 10);
     m_separatorColor = mixedColor(c1, c2, 10);

-    m_roleColor = mixedColor(c1, c2, 70);
+    m_roleColor = mixedColor(c1, c2, 60);

 
     const int padding = qMax(1, m_styleOption.padding);
     const int horizontalMargin = qMax(2, m_styleOption.horizontalMargin);
 
     const int padding = qMax(1, m_styleOption.padding);
     const int horizontalMargin = qMax(2, m_styleOption.horizontalMargin);


@@ -211,4 +213,25 @@ QColor KItemListGroupHeader::mixedColor(const QColor& c1, const QColor& c2, int
                   (c1.blue()  * c1Percent + c2.blue()  * c2Percent) / 100);
 }
 
                   (c1.blue()  * c1Percent + c2.blue()  * c2Percent) / 100);
 }
 

-#include "kitemlistgroupheader.moc"
+QPalette::ColorRole KItemListGroupHeader::normalTextColorRole() const
+{
+    return QPalette::Text;
+}
+
+QPalette::ColorRole KItemListGroupHeader::normalBaseColorRole() const
+{
+    return QPalette::Window;
+}
+
+QColor KItemListGroupHeader::textColor() const
+{
+    const QPalette::ColorGroup group = isActiveWindow() ? QPalette::Active : QPalette::Inactive;
+    return styleOption().palette.color(group, normalTextColorRole());
+}
+
+QColor KItemListGroupHeader::baseColor() const
+{
+    const QPalette::ColorGroup group = isActiveWindow() ? QPalette::Active : QPalette::Inactive;
+    return styleOption().palette.color(group, normalBaseColorRole());
+}
+