Merge branch 'Applications/16.12'

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

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index 75251c9f40d08c165d76484c379591d7d3999843..65fc911bd9b60f3ddd9628327da1ca423407e339 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -27,9 +27,7 @@
 
 #include "private/kitemlistselectiontoggle.h"
 
-#include <QDebug>
 
-#include <KGlobalSettings>
 #include <QApplication>
 #include <QPainter>
 #include <QPropertyAnimation>
@@ -181,8 +179,8 @@ QList<QByteArray> KItemListWidget::visibleRoles() const
 
 void KItemListWidget::setColumnWidth(const QByteArray& role, qreal width)
 {
-    if (m_columnWidths.value(role) != width) {
-        const qreal previousWidth = width;
+    const qreal previousWidth = m_columnWidths.value(role);
+    if (previousWidth != width) {
         m_columnWidths.insert(role, width);
         columnWidthChanged(role, width, previousWidth);
         update();
@@ -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);
     }
@@ -370,7 +368,8 @@ QRectF KItemListWidget::expansionToggleRect() const
 QPixmap KItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem* option,
                                           QWidget* widget)
 {
-    QPixmap pixmap(size().toSize());
+    QPixmap pixmap(size().toSize() * widget->devicePixelRatio());
+    pixmap.setDevicePixelRatio(widget->devicePixelRatio());
     pixmap.fill(Qt::transparent);
 
     QPainter painter(&pixmap);
@@ -517,10 +516,10 @@ void KItemListWidget::clearHoverCache()
 
 void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QStyle::State styleState)
 {
-    QStyleOptionViewItemV4 viewItemOption;
+    QStyleOptionViewItem viewItemOption;
     viewItemOption.initFrom(widget);
     viewItemOption.state = styleState;
-    viewItemOption.viewItemPosition = QStyleOptionViewItemV4::OnlyOne;
+    viewItemOption.viewItemPosition = QStyleOptionViewItem::OnlyOne;
     viewItemOption.showDecorationSelected = true;
     viewItemOption.rect = selectionRect().toRect();
     widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);