Merge branch 'master' into frameworks

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

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index 38f9d00783b728dde89a7b1bc088175c07603a4e..3eb6b1d71a24b3857a7209ce8961865911f24042 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -27,9 +27,7 @@
 
 #include "private/kitemlistselectiontoggle.h"
 
-#include <KDebug>
 
-#include <KGlobalSettings>
 #include <QApplication>
 #include <QPainter>
 #include <QPropertyAnimation>
@@ -250,7 +248,7 @@ void KItemListWidget::setHovered(bool hovered)
 
     if (!m_hoverAnimation) {
         m_hoverAnimation = new QPropertyAnimation(this, "hoverOpacity", this);
-        const int duration = (KGlobalSettings::graphicEffectsLevel() == KGlobalSettings::NoEffects) ? 1 : 200;
+        const int duration = style()->styleHint(QStyle::SH_Widget_Animate) ? 200 : 1;
         m_hoverAnimation->setDuration(duration);
         connect(m_hoverAnimation, &QPropertyAnimation::finished, this, &KItemListWidget::slotHoverAnimationFinished);
     }
@@ -282,7 +280,7 @@ bool KItemListWidget::isHovered() const
 void KItemListWidget::setHoverPosition(const QPointF& pos)
 {
     if (m_selectionToggle) {
-        m_selectionToggle->setHovered(m_selectionToggle->contains(pos));
+        m_selectionToggle->setHovered(selectionToggleRect().contains(pos));
     }
 }
 
@@ -473,8 +471,8 @@ qreal KItemListWidget::hoverOpacity() const
 
 void KItemListWidget::slotHoverAnimationFinished()
 {
-    if (!m_hovered) {
-        delete m_selectionToggle;
+    if (!m_hovered && m_selectionToggle) {
+        m_selectionToggle->deleteLater();
         m_selectionToggle = 0;
     }
 }
@@ -522,8 +520,7 @@ void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QS
     viewItemOption.state = styleState;
     viewItemOption.viewItemPosition = QStyleOptionViewItemV4::OnlyOne;
     viewItemOption.showDecorationSelected = true;
-    viewItemOption.rect = textRect().toRect();
+    viewItemOption.rect = selectionRect().toRect();
     widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);
 }
 
-#include "kitemlistwidget.moc"