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

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

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index 9c31155b3e35ce88723d4a63b0132870fd0f1b1a..42bf9ebdcbb8397cf5feb23a19c766a9b4a36510 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.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  *


@@ -23,11 +22,8 @@
 #include "kitemlistwidget.h"
 
 #include "kitemlistview.h"
 #include "kitemlistwidget.h"
 
 #include "kitemlistview.h"

-#include "kitemmodelbase.h"
-

 #include "private/kitemlistselectiontoggle.h"
 
 #include "private/kitemlistselectiontoggle.h"
 

-

 #include <QApplication>
 #include <QPainter>
 #include <QPropertyAnimation>
 #include <QApplication>
 #include <QPainter>
 #include <QPropertyAnimation>


@@ -42,7 +38,7 @@ KItemListWidgetInformant::~KItemListWidgetInformant()
 }
 
 KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
 }
 
 KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :

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

     m_informant(informant),
     m_index(-1),
     m_selected(false),
     m_informant(informant),
     m_index(-1),
     m_selected(false),


@@ -56,9 +52,9 @@ KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsI
     m_styleOption(),
     m_siblingsInfo(),
     m_hoverOpacity(0),
     m_styleOption(),
     m_siblingsInfo(),
     m_hoverOpacity(0),

-    m_hoverCache(0),
-    m_hoverAnimation(0),
-    m_selectionToggle(0),
+    m_hoverCache(nullptr),
+    m_hoverAnimation(nullptr),
+    m_selectionToggle(nullptr),

     m_editedRole()
 {
 }
     m_editedRole()
 {
 }


@@ -72,7 +68,7 @@ void KItemListWidget::setIndex(int index)
 {
     if (m_index != index) {
         delete m_selectionToggle;
 {
     if (m_index != index) {
         delete m_selectionToggle;

-        m_selectionToggle = 0;
+        m_selectionToggle = nullptr;

 
         if (m_hoverAnimation) {
             m_hoverAnimation->stop();
 
         if (m_hoverAnimation) {
             m_hoverAnimation->stop();


@@ -112,7 +108,7 @@ QHash<QByteArray, QVariant> KItemListWidget::data() const
 
 void KItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
 
 void KItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {

-    Q_UNUSED(option);
+    Q_UNUSED(option)

 
     if (m_alternateBackground) {
         const QColor backgroundColor = m_styleOption.palette.color(QPalette::AlternateBase);
 
     if (m_alternateBackground) {
         const QColor backgroundColor = m_styleOption.palette.color(QPalette::AlternateBase);


@@ -130,7 +126,7 @@ void KItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* o
 
     if (m_current && m_editedRole.isEmpty()) {
         QStyleOptionFocusRect focusRectOption;
 
     if (m_current && m_editedRole.isEmpty()) {
         QStyleOptionFocusRect focusRectOption;

-        focusRectOption.initFrom(widget);
+        initStyleOption(&focusRectOption);

         focusRectOption.rect = textFocusRect().toRect();
         focusRectOption.state = QStyle::State_Enabled | QStyle::State_Item | QStyle::State_KeyboardFocusChange;
         if (m_selected) {
         focusRectOption.rect = textFocusRect().toRect();
         focusRectOption.state = QStyle::State_Enabled | QStyle::State_Item | QStyle::State_KeyboardFocusChange;
         if (m_selected) {


@@ -179,8 +175,8 @@ QList<QByteArray> KItemListWidget::visibleRoles() const
 
 void KItemListWidget::setColumnWidth(const QByteArray& role, qreal width)
 {
 
 void KItemListWidget::setColumnWidth(const QByteArray& role, qreal width)
 {

-    if (m_columnWidths.value(role) != width) {
-        const qreal previousWidth = width;
+    const qreal previousWidth = m_columnWidths.value(role);
+    if (previousWidth != width) {

         m_columnWidths.insert(role, width);
         columnWidthChanged(role, width, previousWidth);
         update();
         m_columnWidths.insert(role, width);
         columnWidthChanged(role, width, previousWidth);
         update();


@@ -194,10 +190,13 @@ qreal KItemListWidget::columnWidth(const QByteArray& role) const
 
 void KItemListWidget::setStyleOption(const KItemListStyleOption& option)
 {
 
 void KItemListWidget::setStyleOption(const KItemListStyleOption& option)
 {

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

     const KItemListStyleOption previous = m_styleOption;
     clearHoverCache();
     m_styleOption = option;
     const KItemListStyleOption previous = m_styleOption;
     clearHoverCache();
     m_styleOption = option;

-

     styleOptionChanged(option, previous);
     update();
 }
     styleOptionChanged(option, previous);
     update();
 }


@@ -379,7 +378,6 @@ QPixmap KItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem* option
     const bool wasHovered = m_hovered;
 
     setAlternateBackground(false);
     const bool wasHovered = m_hovered;
 
     setAlternateBackground(false);

-    setSelected(false);

     setHovered(false);
 
     paint(&painter, option, widget);
     setHovered(false);
 
     paint(&painter, option, widget);


@@ -394,63 +392,63 @@ QPixmap KItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem* option
 void KItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& current,
                                   const QSet<QByteArray>& roles)
 {
 void KItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& current,
                                   const QSet<QByteArray>& roles)
 {

-    Q_UNUSED(current);
-    Q_UNUSED(roles);
+    Q_UNUSED(current)
+    Q_UNUSED(roles)

 }
 
 void KItemListWidget::visibleRolesChanged(const QList<QByteArray>& current,
                                           const QList<QByteArray>& previous)
 {
 }
 
 void KItemListWidget::visibleRolesChanged(const QList<QByteArray>& current,
                                           const QList<QByteArray>& previous)
 {

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

 }
 
 void KItemListWidget::columnWidthChanged(const QByteArray& role,
                                          qreal current,
                                          qreal previous)
 {
 }
 
 void KItemListWidget::columnWidthChanged(const QByteArray& role,
                                          qreal current,
                                          qreal previous)
 {

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

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

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

 }
 
 void KItemListWidget::currentChanged(bool current)
 {
 }
 
 void KItemListWidget::currentChanged(bool current)
 {

-    Q_UNUSED(current);
+    Q_UNUSED(current)

 }
 
 void KItemListWidget::selectedChanged(bool selected)
 {
 }
 
 void KItemListWidget::selectedChanged(bool selected)
 {

-    Q_UNUSED(selected);
+    Q_UNUSED(selected)

 }
 
 void KItemListWidget::hoveredChanged(bool hovered)
 {
 }
 
 void KItemListWidget::hoveredChanged(bool hovered)
 {

-    Q_UNUSED(hovered);
+    Q_UNUSED(hovered)

 }
 
 void KItemListWidget::alternateBackgroundChanged(bool enabled)
 {
 }
 
 void KItemListWidget::alternateBackgroundChanged(bool enabled)
 {

-    Q_UNUSED(enabled);
+    Q_UNUSED(enabled)

 }
 
 void KItemListWidget::siblingsInformationChanged(const QBitArray& current, const QBitArray& previous)
 {
 }
 
 void KItemListWidget::siblingsInformationChanged(const QBitArray& current, const QBitArray& previous)
 {

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

 }
 
 void KItemListWidget::editedRoleChanged(const QByteArray& current, const QByteArray& previous)
 {
 }
 
 void KItemListWidget::editedRoleChanged(const QByteArray& current, const QByteArray& previous)
 {

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

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


@@ -474,7 +472,7 @@ void KItemListWidget::slotHoverAnimationFinished()
 {
     if (!m_hovered && m_selectionToggle) {
         m_selectionToggle->deleteLater();
 {
     if (!m_hovered && m_selectionToggle) {
         m_selectionToggle->deleteLater();

-        m_selectionToggle = 0;
+        m_selectionToggle = nullptr;

     }
 }
 
     }
 }
 


@@ -502,7 +500,7 @@ void KItemListWidget::setHoverOpacity(qreal opacity)
 
     if (m_hoverOpacity <= 0.0) {
         delete m_hoverCache;
 
     if (m_hoverOpacity <= 0.0) {
         delete m_hoverCache;

-        m_hoverCache = 0;
+        m_hoverCache = nullptr;

     }
 
     update();
     }
 
     update();


@@ -511,17 +509,17 @@ void KItemListWidget::setHoverOpacity(qreal opacity)
 void KItemListWidget::clearHoverCache()
 {
     delete m_hoverCache;
 void KItemListWidget::clearHoverCache()
 {
     delete m_hoverCache;

-    m_hoverCache = 0;
+    m_hoverCache = nullptr;

 }
 
 void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QStyle::State styleState)
 {
     QStyleOptionViewItem viewItemOption;
 }
 
 void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QStyle::State styleState)
 {
     QStyleOptionViewItem viewItemOption;

-    viewItemOption.initFrom(widget);
+    initStyleOption(&viewItemOption);

     viewItemOption.state = styleState;
     viewItemOption.viewItemPosition = QStyleOptionViewItem::OnlyOne;
     viewItemOption.showDecorationSelected = true;
     viewItemOption.rect = selectionRect().toRect();
     viewItemOption.state = styleState;
     viewItemOption.viewItemPosition = QStyleOptionViewItem::OnlyOne;
     viewItemOption.showDecorationSelected = true;
     viewItemOption.rect = selectionRect().toRect();

-    widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);
+    style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);

 }
 
 }