Merge branch 'Applications/16.04'

[dolphin.git] / src / kitemviews / private / kitemlistselectiontoggle.cpp

diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp
index 66da6a727bccd2eac4a9af831cbbf7e33df9f23b..9031c870f8c6a8032b74b81b6420c25add5fa716 100644 (file)
--- a/src/kitemviews/private/kitemlistselectiontoggle.cpp
+++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp
@@ -19,18 +19,15 @@
 
 #include "kitemlistselectiontoggle.h"
 
-#include <KIconEffect>
 #include <KIconLoader>
 #include <QPainter>
 
-#include <KDebug>
 
 KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) :
     QGraphicsWidget(parent, 0),
     m_checked(false),
     m_hovered(false)
 {
-    setAcceptHoverEvents(true);
 }
 
 KItemListSelectionToggle::~KItemListSelectionToggle()
@@ -51,6 +48,15 @@ bool KItemListSelectionToggle::isChecked() const
     return m_checked;
 }
 
+void KItemListSelectionToggle::setHovered(bool hovered)
+{
+    if (m_hovered != hovered) {
+        m_hovered = hovered;
+        m_pixmap = QPixmap();
+        update();
+    }
+}
+
 void KItemListSelectionToggle::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
     Q_UNUSED(option);
@@ -65,42 +71,45 @@ void KItemListSelectionToggle::paint(QPainter* painter, const QStyleOptionGraphi
     painter->drawPixmap(x, y, m_pixmap);
 }
 
-void KItemListSelectionToggle::hoverEnterEvent(QGraphicsSceneHoverEvent* event)
+void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event)
 {
-    QGraphicsWidget::hoverEnterEvent(event);
-    m_hovered = true;
-    m_pixmap = QPixmap();
+    QGraphicsWidget::resizeEvent(event);
+
+    if (!m_pixmap.isNull()) {
+        const int pixmapSize = m_pixmap.size().width(); // Pixmap width is always equal pixmap height
+
+        if (pixmapSize != iconSize()) {
+            // If the required icon size is different from the actual pixmap size,
+            // overwrite the m_pixmap with an empty pixmap and reload the new
+            // icon on next re-painting.
+            m_pixmap = QPixmap();
+        }
+    }
 }
 
-void KItemListSelectionToggle::hoverLeaveEvent(QGraphicsSceneHoverEvent* event)
+void KItemListSelectionToggle::updatePixmap()
 {
-    QGraphicsWidget::hoverLeaveEvent(event);
-    m_hovered = false;
-    m_pixmap = QPixmap();
+    const QString icon = m_checked ? QStringLiteral("emblem-remove") : QStringLiteral("emblem-added");
+    const KIconLoader::States state = m_hovered ? KIconLoader::ActiveState : KIconLoader::DisabledState;
+    m_pixmap = KIconLoader::global()->loadIcon(icon, KIconLoader::Desktop, iconSize(), state);
 }
 
-void KItemListSelectionToggle::updatePixmap()
+int KItemListSelectionToggle::iconSize() const
 {
-    const char* icon = m_checked ? "list-remove" : "list-add";
+    const int iconSize = qMin(size().width(), size().height());
 
-    int iconSize = qMin(size().width(), size().height());
     if (iconSize < KIconLoader::SizeSmallMedium) {
-        iconSize = KIconLoader::SizeSmall;
+        return KIconLoader::SizeSmall;
     } else if (iconSize < KIconLoader::SizeMedium) {
-        iconSize = KIconLoader::SizeSmallMedium;
+        return KIconLoader::SizeSmallMedium;
     } else if (iconSize < KIconLoader::SizeLarge) {
-        iconSize = KIconLoader::SizeMedium;
+        return KIconLoader::SizeMedium;
     } else if (iconSize < KIconLoader::SizeHuge) {
-        iconSize = KIconLoader::SizeLarge;
+        return KIconLoader::SizeLarge;
     } else if (iconSize < KIconLoader::SizeEnormous) {
-        iconSize = KIconLoader::SizeHuge;
+        return KIconLoader::SizeHuge;
     }
 
-    m_pixmap = KIconLoader::global()->loadIcon(QLatin1String(icon), KIconLoader::NoGroup, iconSize);
-
-    if (m_hovered) {
-        KIconLoader::global()->iconEffect()->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::ActiveState);
-    }
+    return iconSize;
 }
 
-#include "kitemlistselectiontoggle.moc"