Adjust the size and position of the selection toggle on icon

resize (when changing the zoomlevel).

BUG: 310412
REVIEW: 112250
FIXED-IN: 4.11.1

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index 6a7111ad7e207b007030529c136e9eb8928c0765..85cd70c43f9e0c0ee4890ad5fa49ed9f8d756476 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -451,6 +451,12 @@ void KItemListWidget::resizeEvent(QGraphicsSceneResizeEvent* event)
 {
     QGraphicsWidget::resizeEvent(event);
     clearHoverCache();
 {
     QGraphicsWidget::resizeEvent(event);
     clearHoverCache();

+
+    if (m_selectionToggle) {
+        const QRectF& toggleRect = selectionToggleRect();
+        m_selectionToggle->setPos(toggleRect.topLeft());
+        m_selectionToggle->resize(toggleRect.size());
+    }

 }
 
 qreal KItemListWidget::hoverOpacity() const
 }
 
 qreal KItemListWidget::hoverOpacity() const

diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp
index 66da6a727bccd2eac4a9af831cbbf7e33df9f23b..6bbf3c2ec812aac39334ba35dd47eb0b42d47830 100644 (file)
--- a/src/kitemviews/private/kitemlistselectiontoggle.cpp
+++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp
@@ -79,28 +79,49 @@ void KItemListSelectionToggle::hoverLeaveEvent(QGraphicsSceneHoverEvent* event)
     m_pixmap = QPixmap();
 }
 
     m_pixmap = QPixmap();
 }
 

+void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event)
+{
+    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::updatePixmap()
 {
     const char* icon = m_checked ? "list-remove" : "list-add";
 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);
+    }
+}
+
+int KItemListSelectionToggle::iconSize() const
+{
+    const int iconSize = qMin(size().width(), size().height());

 
 

-    int iconSize = qMin(size().width(), size().height());

     if (iconSize < KIconLoader::SizeSmallMedium) {
     if (iconSize < KIconLoader::SizeSmallMedium) {

-        iconSize = KIconLoader::SizeSmall;
+        return KIconLoader::SizeSmall;

     } else if (iconSize < KIconLoader::SizeMedium) {
     } else if (iconSize < KIconLoader::SizeMedium) {

-        iconSize = KIconLoader::SizeSmallMedium;
+        return KIconLoader::SizeSmallMedium;

     } else if (iconSize < KIconLoader::SizeLarge) {
     } else if (iconSize < KIconLoader::SizeLarge) {

-        iconSize = KIconLoader::SizeMedium;
+        return KIconLoader::SizeMedium;

     } else if (iconSize < KIconLoader::SizeHuge) {
     } else if (iconSize < KIconLoader::SizeHuge) {

-        iconSize = KIconLoader::SizeLarge;
+        return KIconLoader::SizeLarge;

     } else if (iconSize < KIconLoader::SizeEnormous) {
     } 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"
 }
 
 #include "kitemlistselectiontoggle.moc"

diff --git a/src/kitemviews/private/kitemlistselectiontoggle.h b/src/kitemviews/private/kitemlistselectiontoggle.h
index a8050d811f23ebfcafa5ff8fa8b8e14f40b60837..ba29293f6291db8523ef67a32ef545373541fa0f 100644 (file)
--- a/src/kitemviews/private/kitemlistselectiontoggle.h
+++ b/src/kitemviews/private/kitemlistselectiontoggle.h
@@ -46,9 +46,11 @@ public:
 protected:
     virtual void hoverEnterEvent(QGraphicsSceneHoverEvent* event);
     virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent* event);
 protected:
     virtual void hoverEnterEvent(QGraphicsSceneHoverEvent* event);
     virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent* event);

+    virtual void resizeEvent(QGraphicsSceneResizeEvent* event);

 
 private:
     void updatePixmap();
 
 private:
     void updatePixmap();

+    int iconSize() const;

 
 private:
     bool m_checked;
 
 private:
     bool m_checked;