Merge remote-tracking branch 'origin/master' into frameworks

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

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index 45329afb335b555f62b69cb14469005421490076..a703c2b23c9e3bfce88130a095996da15b6bf794 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -252,7 +252,7 @@ void KItemListWidget::setHovered(bool hovered)
         m_hoverAnimation = new QPropertyAnimation(this, "hoverOpacity", this);
         const int duration = (KGlobalSettings::graphicEffectsLevel() == KGlobalSettings::NoEffects) ? 1 : 200;
         m_hoverAnimation->setDuration(duration);
         m_hoverAnimation = new QPropertyAnimation(this, "hoverOpacity", this);
         const int duration = (KGlobalSettings::graphicEffectsLevel() == KGlobalSettings::NoEffects) ? 1 : 200;
         m_hoverAnimation->setDuration(duration);

-        connect(m_hoverAnimation, SIGNAL(finished()), this, SLOT(slotHoverAnimationFinished()));
+        connect(m_hoverAnimation, &QPropertyAnimation::finished, this, &KItemListWidget::slotHoverAnimationFinished);

     }
     m_hoverAnimation->stop();
 
     }
     m_hoverAnimation->stop();
 


@@ -279,6 +279,13 @@ bool KItemListWidget::isHovered() const
     return m_hovered;
 }
 
     return m_hovered;
 }
 

+void KItemListWidget::setHoverPosition(const QPointF& pos)
+{
+    if (m_selectionToggle) {
+        m_selectionToggle->setHovered(selectionToggleRect().contains(pos));
+    }
+}
+

 void KItemListWidget::setAlternateBackground(bool enable)
 {
     if (m_alternateBackground != enable) {
 void KItemListWidget::setAlternateBackground(bool enable)
 {
     if (m_alternateBackground != enable) {


@@ -369,9 +376,18 @@ QPixmap KItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem* option
     QPainter painter(&pixmap);
 
     const bool oldAlternateBackground = m_alternateBackground;
     QPainter painter(&pixmap);
 
     const bool oldAlternateBackground = m_alternateBackground;

+    const bool wasSelected = m_selected;
+    const bool wasHovered = m_hovered;
+

     setAlternateBackground(false);
     setAlternateBackground(false);

+    setSelected(false);
+    setHovered(false);
+

     paint(&painter, option, widget);
     paint(&painter, option, widget);

+

     setAlternateBackground(oldAlternateBackground);
     setAlternateBackground(oldAlternateBackground);

+    setSelected(wasSelected);
+    setHovered(wasHovered);

 
     return pixmap;
 }
 
     return pixmap;
 }


@@ -442,6 +458,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