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 6bbf3c2ec812aac39334ba35dd47eb0b42d47830..9031c870f8c6a8032b74b81b6420c25add5fa716 100644 (file)
--- a/src/kitemviews/private/kitemlistselectiontoggle.cpp
+++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp
@@ -19,18 +19,15 @@
 
 #include "kitemlistselectiontoggle.h"
 
 
 #include "kitemlistselectiontoggle.h"
 

-#include <KIconEffect>

 #include <KIconLoader>
 #include <QPainter>
 
 #include <KIconLoader>
 #include <QPainter>
 

-#include <KDebug>

 
 KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) :
     QGraphicsWidget(parent, 0),
     m_checked(false),
     m_hovered(false)
 {
 
 KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) :
     QGraphicsWidget(parent, 0),
     m_checked(false),
     m_hovered(false)
 {

-    setAcceptHoverEvents(true);

 }
 
 KItemListSelectionToggle::~KItemListSelectionToggle()
 }
 
 KItemListSelectionToggle::~KItemListSelectionToggle()


@@ -51,6 +48,15 @@ bool KItemListSelectionToggle::isChecked() const
     return m_checked;
 }
 
     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);
 void KItemListSelectionToggle::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
     Q_UNUSED(option);


@@ -65,20 +71,6 @@ void KItemListSelectionToggle::paint(QPainter* painter, const QStyleOptionGraphi
     painter->drawPixmap(x, y, m_pixmap);
 }
 
     painter->drawPixmap(x, y, m_pixmap);
 }
 

-void KItemListSelectionToggle::hoverEnterEvent(QGraphicsSceneHoverEvent* event)
-{
-    QGraphicsWidget::hoverEnterEvent(event);
-    m_hovered = true;
-    m_pixmap = QPixmap();
-}
-
-void KItemListSelectionToggle::hoverLeaveEvent(QGraphicsSceneHoverEvent* event)
-{
-    QGraphicsWidget::hoverLeaveEvent(event);
-    m_hovered = false;
-    m_pixmap = QPixmap();
-}
-

 void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event)
 {
     QGraphicsWidget::resizeEvent(event);
 void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event)
 {
     QGraphicsWidget::resizeEvent(event);


@@ -97,12 +89,9 @@ void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event)
 
 void KItemListSelectionToggle::updatePixmap()
 {
 
 void KItemListSelectionToggle::updatePixmap()
 {

-    const char* icon = m_checked ? "list-remove" : "list-add";
-    m_pixmap = KIconLoader::global()->loadIcon(QLatin1String(icon), KIconLoader::NoGroup, iconSize());
-
-    if (m_hovered) {
-        KIconLoader::global()->iconEffect()->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::ActiveState);
-    }
+    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);

 }
 
 int KItemListSelectionToggle::iconSize() const
 }
 
 int KItemListSelectionToggle::iconSize() const


@@ -124,4 +113,3 @@ int KItemListSelectionToggle::iconSize() const
     return iconSize;
 }
 
     return iconSize;
 }
 

-#include "kitemlistselectiontoggle.moc"