Clazy fix

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

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index 5541aa9f89f811658004c67d9a4f48c97730d9d5..baf2445726d1e18255619306613ae7202551dda6 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -27,28 +27,29 @@ KItemListWidgetInformant::~KItemListWidgetInformant()
 {
 }
 
 {
 }
 

-KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
-    QGraphicsWidget(parent),
-    m_informant(informant),
-    m_index(-1),
-    m_selected(false),
-    m_current(false),
-    m_hovered(false),
-    m_expansionAreaHovered(false),
-    m_alternateBackground(false),
-    m_enabledSelectionToggle(false),
-    m_data(),
-    m_visibleRoles(),
-    m_columnWidths(),
-    m_styleOption(),
-    m_siblingsInfo(),
-    m_hoverOpacity(0),
-    m_hoverCache(nullptr),
-    m_hoverAnimation(nullptr),
-    m_hoverSequenceIndex(0),
-    m_selectionToggle(nullptr),
-    m_editedRole(),
-    m_iconSize(-1)
+KItemListWidget::KItemListWidget(KItemListWidgetInformant *informant, QGraphicsItem *parent)
+    : QGraphicsWidget(parent)
+    , m_informant(informant)
+    , m_index(-1)
+    , m_selected(false)
+    , m_current(false)
+    , m_hovered(false)
+    , m_expansionAreaHovered(false)
+    , m_alternateBackground(false)
+    , m_enabledSelectionToggle(false)
+    , m_data()
+    , m_visibleRoles()
+    , m_columnWidths()
+    , m_leftPadding(0)
+    , m_rightPadding(0)
+    , m_styleOption()
+    , m_siblingsInfo()
+    , m_hoverOpacity(0)
+    , m_hoverCache(nullptr)
+    , m_hoverSequenceIndex(0)
+    , m_selectionToggle(nullptr)
+    , m_editedRole()
+    , m_iconSize(-1)

 {
     connect(&m_hoverSequenceTimer, &QTimer::timeout, this, &KItemListWidget::slotHoverSequenceTimerTimeout);
 }
 {
     connect(&m_hoverSequenceTimer, &QTimer::timeout, this, &KItemListWidget::slotHoverSequenceTimerTimeout);
 }


@@ -64,10 +65,8 @@ void KItemListWidget::setIndex(int index)
         delete m_selectionToggle;
         m_selectionToggle = nullptr;
 
         delete m_selectionToggle;
         m_selectionToggle = nullptr;
 

-        if (m_hoverAnimation) {
-            m_hoverAnimation->stop();
-            m_hoverOpacity = 0;
-        }
+        m_hoverOpacity = 0;
+

         clearHoverCache();
 
         m_index = index;
         clearHoverCache();
 
         m_index = index;


@@ -79,15 +78,14 @@ int KItemListWidget::index() const
     return m_index;
 }
 
     return m_index;
 }
 

-void KItemListWidget::setData(const QHash<QByteArray, QVariant>& data,
-                              const QSet<QByteArray>& roles)
+void KItemListWidget::setData(const QHash<QByteArray, QVariant> &data, const QSet<QByteArray> &roles)

 {
     clearHoverCache();
     if (roles.isEmpty()) {
         m_data = data;
         dataChanged(m_data);
     } else {
 {
     clearHoverCache();
     if (roles.isEmpty()) {
         m_data = data;
         dataChanged(m_data);
     } else {

-        for (const QByteArray& role : roles) {
+        for (const QByteArray &role : roles) {

             m_data[role] = data[role];
         }
         dataChanged(m_data, roles);
             m_data[role] = data[role];
         }
         dataChanged(m_data, roles);


@@ -100,22 +98,35 @@ QHash<QByteArray, QVariant> KItemListWidget::data() const
     return m_data;
 }
 
     return m_data;
 }
 

-void KItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
+QVariant KItemListWidget::value(const QByteArray &key) const
+{
+    return m_data.value(key);
+}
+
+void KItemListWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)

 {
     Q_UNUSED(option)
 
     if (m_alternateBackground) {
 {
     Q_UNUSED(option)
 
     if (m_alternateBackground) {

-        const QColor backgroundColor = m_styleOption.palette.color(QPalette::AlternateBase);
+        QColor backgroundColor = m_styleOption.palette.color(QPalette::AlternateBase);
+        if (!widget->hasFocus()) {
+            QColor baseColor = m_styleOption.palette.color(QPalette::Base);
+            if (baseColor.lightnessF() > 0.5) {
+                // theme seems light
+                backgroundColor = backgroundColor.lighter(101);
+            } else {
+                // theme seems dark
+                backgroundColor = backgroundColor.darker(101);
+            }
+        }
+

         const QRectF backgroundRect(0, 0, size().width(), size().height());
         painter->fillRect(backgroundRect, backgroundColor);
     }
 
     if (m_selected && m_editedRole.isEmpty()) {
         const QRectF backgroundRect(0, 0, size().width(), size().height());
         painter->fillRect(backgroundRect, backgroundColor);
     }
 
     if (m_selected && m_editedRole.isEmpty()) {

-        const QStyle::State activeState(isActiveWindow() ? QStyle::State_Active : 0);
-        drawItemStyleOption(painter, widget, activeState |
-                                             QStyle::State_Enabled |
-                                             QStyle::State_Selected |
-                                             QStyle::State_Item);
+        const QStyle::State activeState(isActiveWindow() && widget->hasFocus() ? QStyle::State_Active : 0);
+        drawItemStyleOption(painter, widget, activeState | QStyle::State_Enabled | QStyle::State_Selected | QStyle::State_Item);

     }
 
     if (m_current && m_editedRole.isEmpty()) {
     }
 
     if (m_current && m_editedRole.isEmpty()) {


@@ -123,7 +134,7 @@ void KItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* o
         initStyleOption(&focusRectOption);
         focusRectOption.rect = textFocusRect().toRect();
         focusRectOption.state = QStyle::State_Enabled | QStyle::State_Item | QStyle::State_KeyboardFocusChange;
         initStyleOption(&focusRectOption);
         focusRectOption.rect = textFocusRect().toRect();
         focusRectOption.state = QStyle::State_Enabled | QStyle::State_Item | QStyle::State_KeyboardFocusChange;

-        if (m_selected) {
+        if (m_selected && widget->hasFocus()) {

             focusRectOption.state |= QStyle::State_Selected;
         }
 
             focusRectOption.state |= QStyle::State_Selected;
         }
 


@@ -138,11 +149,8 @@ void KItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* o
             m_hoverCache->fill(Qt::transparent);
 
             QPainter pixmapPainter(m_hoverCache);
             m_hoverCache->fill(Qt::transparent);
 
             QPainter pixmapPainter(m_hoverCache);

-            const QStyle::State activeState(isActiveWindow() ? QStyle::State_Active : 0);
-            drawItemStyleOption(&pixmapPainter, widget, activeState |
-                                                        QStyle::State_Enabled |
-                                                        QStyle::State_MouseOver |
-                                                        QStyle::State_Item);
+            const QStyle::State activeState(isActiveWindow() && widget->hasFocus() ? QStyle::State_Active | QStyle::State_Enabled : 0);
+            drawItemStyleOption(&pixmapPainter, widget, activeState | QStyle::State_MouseOver | QStyle::State_Item);

         }
 
         const qreal opacity = painter->opacity();
         }
 
         const qreal opacity = painter->opacity();


@@ -152,7 +160,7 @@ void KItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* o
     }
 }
 
     }
 }
 

-void KItemListWidget::setVisibleRoles(const QList<QByteArray>& roles)
+void KItemListWidget::setVisibleRoles(const QList<QByteArray> &roles)

 {
     const QList<QByteArray> previousRoles = m_visibleRoles;
     m_visibleRoles = roles;
 {
     const QList<QByteArray> previousRoles = m_visibleRoles;
     m_visibleRoles = roles;


@@ -166,8 +174,7 @@ QList<QByteArray> KItemListWidget::visibleRoles() const
     return m_visibleRoles;
 }
 
     return m_visibleRoles;
 }
 

-
-void KItemListWidget::setColumnWidth(const QByteArray& role, qreal width)
+void KItemListWidget::setColumnWidth(const QByteArray &role, qreal width)

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


@@ -177,24 +184,43 @@ void KItemListWidget::setColumnWidth(const QByteArray& role, qreal width)
     }
 }
 
     }
 }
 

-qreal KItemListWidget::columnWidth(const QByteArray& role) const
+qreal KItemListWidget::columnWidth(const QByteArray &role) const

 {
     return m_columnWidths.value(role);
 }
 
 {
     return m_columnWidths.value(role);
 }
 

-qreal KItemListWidget::sidePadding() const {
-    return m_sidePadding;
-}
+void KItemListWidget::setSidePadding(qreal leftPaddingWidth, qreal rightPaddingWidth)
+{
+    bool changed = false;
+    if (m_leftPadding != leftPaddingWidth) {
+        m_leftPadding = leftPaddingWidth;
+        changed = true;
+    }

 
 

-void KItemListWidget::setSidePadding(qreal width) {
-    if (m_sidePadding != width){
-        m_sidePadding = width;
-        sidePaddingChanged(width);
-        update();
+    if (m_rightPadding != rightPaddingWidth) {
+        m_rightPadding = rightPaddingWidth;
+        changed = true;

     }
     }

+
+    if (!changed) {
+        return;
+    }
+
+    sidePaddingChanged(leftPaddingWidth, rightPaddingWidth);
+    update();

 }
 
 }
 

-void KItemListWidget::setStyleOption(const KItemListStyleOption& option)
+qreal KItemListWidget::leftPadding() const
+{
+    return m_leftPadding;
+}
+
+qreal KItemListWidget::rightPadding() const
+{
+    return m_rightPadding;
+}
+
+void KItemListWidget::setStyleOption(const KItemListStyleOption &option)

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


@@ -207,7 +233,7 @@ void KItemListWidget::setStyleOption(const KItemListStyleOption& option)
     update();
 }
 
     update();
 }
 

-const KItemListStyleOption& KItemListWidget::styleOption() const
+const KItemListStyleOption &KItemListWidget::styleOption() const

 {
     return m_styleOption;
 }
 {
     return m_styleOption;
 }


@@ -251,40 +277,33 @@ void KItemListWidget::setHovered(bool hovered)
 
     m_hovered = hovered;
 
 
     m_hovered = hovered;
 

-    if (!m_hoverAnimation) {
-        m_hoverAnimation = new QPropertyAnimation(this, "hoverOpacity", this);
-        const int duration = style()->styleHint(QStyle::SH_Widget_Animate) ? 200 : 1;
-        m_hoverAnimation->setDuration(duration);
-        connect(m_hoverAnimation, &QPropertyAnimation::finished, this, &KItemListWidget::slotHoverAnimationFinished);
-    }
-    m_hoverAnimation->stop();
-

     m_hoverSequenceIndex = 0;
 
     if (hovered) {
     m_hoverSequenceIndex = 0;
 
     if (hovered) {

-        const qreal startValue = qMax(hoverOpacity(), qreal(0.1));
-        m_hoverAnimation->setStartValue(startValue);
-        m_hoverAnimation->setEndValue(1.0);
+        setHoverOpacity(1.0);
+

         if (m_enabledSelectionToggle && !(QApplication::mouseButtons() & Qt::LeftButton)) {
             initializeSelectionToggle();
         }
 
         hoverSequenceStarted();
 
         if (m_enabledSelectionToggle && !(QApplication::mouseButtons() & Qt::LeftButton)) {
             initializeSelectionToggle();
         }
 
         hoverSequenceStarted();
 

-        const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
+        const KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));

         const int interval = globalConfig.readEntry("HoverSequenceInterval", 700);
 
         m_hoverSequenceTimer.start(interval);
     } else {
         const int interval = globalConfig.readEntry("HoverSequenceInterval", 700);
 
         m_hoverSequenceTimer.start(interval);
     } else {

-        m_hoverAnimation->setStartValue(hoverOpacity());
-        m_hoverAnimation->setEndValue(0.0);
+        setHoverOpacity(0.0);
+
+        if (m_selectionToggle) {
+            m_selectionToggle->deleteLater();
+            m_selectionToggle = nullptr;
+        }

 
         hoverSequenceEnded();
         m_hoverSequenceTimer.stop();
     }
 
 
         hoverSequenceEnded();
         m_hoverSequenceTimer.stop();
     }
 

-    m_hoverAnimation->start();
-

     hoveredChanged(hovered);
     update();
 }
     hoveredChanged(hovered);
     update();
 }


@@ -308,7 +327,7 @@ bool KItemListWidget::expansionAreaHovered() const
     return m_expansionAreaHovered;
 }
 
     return m_expansionAreaHovered;
 }
 

-void KItemListWidget::setHoverPosition(const QPointF& pos)
+void KItemListWidget::setHoverPosition(const QPointF &pos)

 {
     if (m_selectionToggle) {
         m_selectionToggle->setHovered(selectionToggleRect().contains(pos));
 {
     if (m_selectionToggle) {
         m_selectionToggle->setHovered(selectionToggleRect().contains(pos));


@@ -333,6 +352,17 @@ void KItemListWidget::setEnabledSelectionToggle(bool enable)
 {
     if (m_enabledSelectionToggle != enable) {
         m_enabledSelectionToggle = enable;
 {
     if (m_enabledSelectionToggle != enable) {
         m_enabledSelectionToggle = enable;

+
+        // We want the change to take effect immediately.
+        if (m_enabledSelectionToggle) {
+            if (m_hovered) {
+                initializeSelectionToggle();
+            }
+        } else if (m_selectionToggle) {
+            m_selectionToggle->deleteLater();
+            m_selectionToggle = nullptr;
+        }
+

         update();
     }
 }
         update();
     }
 }


@@ -342,7 +372,7 @@ bool KItemListWidget::enabledSelectionToggle() const
     return m_enabledSelectionToggle;
 }
 
     return m_enabledSelectionToggle;
 }
 

-void KItemListWidget::setSiblingsInformation(const QBitArray& siblings)
+void KItemListWidget::setSiblingsInformation(const QBitArray &siblings)

 {
     const QBitArray previous = m_siblingsInfo;
     m_siblingsInfo = siblings;
 {
     const QBitArray previous = m_siblingsInfo;
     m_siblingsInfo = siblings;


@@ -355,7 +385,7 @@ QBitArray KItemListWidget::siblingsInformation() const
     return m_siblingsInfo;
 }
 
     return m_siblingsInfo;
 }
 

-void KItemListWidget::setEditedRole(const QByteArray& role)
+void KItemListWidget::setEditedRole(const QByteArray &role)

 {
     if (m_editedRole != role) {
         const QByteArray previous = m_editedRole;
 {
     if (m_editedRole != role) {
         const QByteArray previous = m_editedRole;


@@ -383,16 +413,13 @@ int KItemListWidget::iconSize() const
     return m_iconSize;
 }
 
     return m_iconSize;
 }
 

-bool KItemListWidget::contains(const QPointF& point) const
+bool KItemListWidget::contains(const QPointF &point) const

 {
     if (!QGraphicsWidget::contains(point)) {
         return false;
     }
 
 {
     if (!QGraphicsWidget::contains(point)) {
         return false;
     }
 

-    return iconRect().contains(point) ||
-           textRect().contains(point) ||
-           expansionToggleRect().contains(point) ||
-           selectionToggleRect().contains(point);
+    return iconRect().contains(point) || textRect().contains(point) || expansionToggleRect().contains(point) || selectionToggleRect().contains(point);

 }
 
 QRectF KItemListWidget::textFocusRect() const
 }
 
 QRectF KItemListWidget::textFocusRect() const


@@ -410,8 +437,7 @@ QRectF KItemListWidget::expansionToggleRect() const
     return QRectF();
 }
 
     return QRectF();
 }
 

-QPixmap KItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem* option,
-                                          QWidget* widget)
+QPixmap KItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem *option, QWidget *widget)

 {
     QPixmap pixmap(size().toSize() * widget->devicePixelRatio());
     pixmap.setDevicePixelRatio(widget->devicePixelRatio());
 {
     QPixmap pixmap(size().toSize() * widget->devicePixelRatio());
     pixmap.setDevicePixelRatio(widget->devicePixelRatio());


@@ -435,36 +461,37 @@ QPixmap KItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem* option
     return pixmap;
 }
 
     return pixmap;
 }
 

-void KItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& current,
-                                  const QSet<QByteArray>& roles)
+void KItemListWidget::startActivateSoonAnimation(int timeUntilActivation)
+{
+    Q_UNUSED(timeUntilActivation)
+}
+
+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::sidePaddingChanged(qreal width)
+void KItemListWidget::sidePaddingChanged(qreal leftPaddingWidth, qreal rightPaddingWidth)

 {
 {

-    Q_UNUSED(width)
+    Q_UNUSED(leftPaddingWidth)
+    Q_UNUSED(rightPaddingWidth)

 }
 
 }
 

-void KItemListWidget::styleOptionChanged(const KItemListStyleOption& current,
-                                         const KItemListStyleOption& previous)
+void KItemListWidget::styleOptionChanged(const KItemListStyleOption &current, const KItemListStyleOption &previous)

 {
     Q_UNUSED(previous)
 
 {
     Q_UNUSED(previous)
 


@@ -494,13 +521,13 @@ 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)


@@ -512,13 +539,13 @@ void KItemListWidget::iconSizeChanged(int current, int previous)
     Q_UNUSED(previous)
 }
 
     Q_UNUSED(previous)
 }
 

-void KItemListWidget::resizeEvent(QGraphicsSceneResizeEvent* event)
+void KItemListWidget::resizeEvent(QGraphicsSceneResizeEvent *event)

 {
     QGraphicsWidget::resizeEvent(event);
     clearHoverCache();
 
     if (m_selectionToggle) {
 {
     QGraphicsWidget::resizeEvent(event);
     clearHoverCache();
 
     if (m_selectionToggle) {

-        const QRectF& toggleRect = selectionToggleRect();
+        const QRectF &toggleRect = selectionToggleRect();

         m_selectionToggle->setPos(toggleRect.topLeft());
         m_selectionToggle->resize(toggleRect.size());
     }
         m_selectionToggle->setPos(toggleRect.topLeft());
         m_selectionToggle->resize(toggleRect.size());
     }


@@ -547,14 +574,6 @@ int KItemListWidget::hoverSequenceIndex() const
     return m_hoverSequenceIndex;
 }
 
     return m_hoverSequenceIndex;
 }
 

-void KItemListWidget::slotHoverAnimationFinished()
-{
-    if (!m_hovered && m_selectionToggle) {
-        m_selectionToggle->deleteLater();
-        m_selectionToggle = nullptr;
-    }
-}
-

 void KItemListWidget::slotHoverSequenceTimerTimeout()
 {
     m_hoverSequenceIndex++;
 void KItemListWidget::slotHoverSequenceTimerTimeout()
 {
     m_hoverSequenceIndex++;


@@ -597,7 +616,7 @@ void KItemListWidget::clearHoverCache()
     m_hoverCache = nullptr;
 }
 
     m_hoverCache = nullptr;
 }
 

-void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QStyle::State styleState)
+void KItemListWidget::drawItemStyleOption(QPainter *painter, QWidget *widget, QStyle::State styleState)

 {
     QStyleOptionViewItem viewItemOption;
     initStyleOption(&viewItemOption);
 {
     QStyleOptionViewItem viewItemOption;
     initStyleOption(&viewItemOption);


@@ -608,3 +627,4 @@ void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QS
     style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);
 }
 
     style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);
 }
 

+#include "moc_kitemlistwidget.cpp"