Fix wrong window titles

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

diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp
index c33c15ec2848fecbbcf8f4a9a9e581bfee3d550a..5519e4da8d2ad78cecab31d8428595efe553aebb 100644 (file)
--- a/src/kitemviews/private/kitemlistselectiontoggle.cpp
+++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp
@@ -19,14 +19,13 @@
 
 #include "kitemlistselectiontoggle.h"
 
 
 #include "kitemlistselectiontoggle.h"
 

-#include <KIconEffect>

 #include <KIconLoader>
 #include <KIconLoader>

-#include <QPainter>

 
 

-#include <KDebug>
+#include <QIcon>
+#include <QPainter>

 
 KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) :
 
 KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) :

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

     m_checked(false),
     m_hovered(false)
 {
     m_checked(false),
     m_hovered(false)
 {


@@ -68,8 +67,8 @@ void KItemListSelectionToggle::paint(QPainter* painter, const QStyleOptionGraphi
         updatePixmap();
     }
 
         updatePixmap();
     }
 

-    const qreal x = (size().width()  - qreal(m_pixmap.width()))  / 2;
-    const qreal y = (size().height() - qreal(m_pixmap.height())) / 2;
+    const qreal x = (size().width()  - qreal(m_pixmap.width() / m_pixmap.devicePixelRatioF()))  / 2;
+    const qreal y = (size().height() - qreal(m_pixmap.height() / m_pixmap.devicePixelRatioF())) / 2;

     painter->drawPixmap(x, y, m_pixmap);
 }
 
     painter->drawPixmap(x, y, m_pixmap);
 }
 


@@ -78,7 +77,7 @@ void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event)
     QGraphicsWidget::resizeEvent(event);
 
     if (!m_pixmap.isNull()) {
     QGraphicsWidget::resizeEvent(event);
 
     if (!m_pixmap.isNull()) {

-        const int pixmapSize = m_pixmap.size().width(); // Pixmap width is always equal pixmap height
+        const int pixmapSize = m_pixmap.size().width() / m_pixmap.devicePixelRatioF(); // Pixmap width is always equal pixmap height

 
         if (pixmapSize != iconSize()) {
             // If the required icon size is different from the actual pixmap size,
 
         if (pixmapSize != iconSize()) {
             // If the required icon size is different from the actual pixmap size,


@@ -91,9 +90,8 @@ void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event)
 
 void KItemListSelectionToggle::updatePixmap()
 {
 
 void KItemListSelectionToggle::updatePixmap()
 {

-    const QString icon = m_checked ? "list-remove" : "list-add";
-    const KIconLoader::States state = m_hovered ? KIconLoader::ActiveState : KIconLoader::DisabledState;
-    m_pixmap = KIconLoader::global()->loadIcon(icon, KIconLoader::Desktop, iconSize(), state);
+    const QString icon = m_checked ? QStringLiteral("emblem-remove") : QStringLiteral("emblem-added");
+    m_pixmap = QIcon::fromTheme(icon).pixmap(iconSize(), m_hovered ? QIcon::Active : QIcon::Disabled);

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