Merge branch 'Applications/18.04'

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

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index 3eb6b1d71a24b3857a7209ce8961865911f24042..28b374620c38ff7fe1122164f8011756a4489faa 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -23,11 +23,8 @@
 #include "kitemlistwidget.h"
 
 #include "kitemlistview.h"
 #include "kitemlistwidget.h"
 
 #include "kitemlistview.h"

-#include "kitemmodelbase.h"
-

 #include "private/kitemlistselectiontoggle.h"
 
 #include "private/kitemlistselectiontoggle.h"
 

-

 #include <QApplication>
 #include <QPainter>
 #include <QPropertyAnimation>
 #include <QApplication>
 #include <QPainter>
 #include <QPropertyAnimation>


@@ -42,7 +39,7 @@ KItemListWidgetInformant::~KItemListWidgetInformant()
 }
 
 KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
 }
 
 KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :

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

     m_informant(informant),
     m_index(-1),
     m_selected(false),
     m_informant(informant),
     m_index(-1),
     m_selected(false),


@@ -56,9 +53,9 @@ KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsI
     m_styleOption(),
     m_siblingsInfo(),
     m_hoverOpacity(0),
     m_styleOption(),
     m_siblingsInfo(),
     m_hoverOpacity(0),

-    m_hoverCache(0),
-    m_hoverAnimation(0),
-    m_selectionToggle(0),
+    m_hoverCache(nullptr),
+    m_hoverAnimation(nullptr),
+    m_selectionToggle(nullptr),

     m_editedRole()
 {
 }
     m_editedRole()
 {
 }


@@ -72,7 +69,7 @@ void KItemListWidget::setIndex(int index)
 {
     if (m_index != index) {
         delete m_selectionToggle;
 {
     if (m_index != index) {
         delete m_selectionToggle;

-        m_selectionToggle = 0;
+        m_selectionToggle = nullptr;

 
         if (m_hoverAnimation) {
             m_hoverAnimation->stop();
 
         if (m_hoverAnimation) {
             m_hoverAnimation->stop();


@@ -179,8 +176,8 @@ QList<QByteArray> KItemListWidget::visibleRoles() const
 
 void KItemListWidget::setColumnWidth(const QByteArray& role, qreal width)
 {
 
 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();
         m_columnWidths.insert(role, width);
         columnWidthChanged(role, width, previousWidth);
         update();


@@ -194,10 +191,13 @@ qreal KItemListWidget::columnWidth(const QByteArray& role) const
 
 void KItemListWidget::setStyleOption(const KItemListStyleOption& option)
 {
 
 void KItemListWidget::setStyleOption(const KItemListStyleOption& option)
 {

+    if (m_styleOption == option) {
+        return;
+    }
+

     const KItemListStyleOption previous = m_styleOption;
     clearHoverCache();
     m_styleOption = option;
     const KItemListStyleOption previous = m_styleOption;
     clearHoverCache();
     m_styleOption = option;

-

     styleOptionChanged(option, previous);
     update();
 }
     styleOptionChanged(option, previous);
     update();
 }


@@ -368,7 +368,8 @@ QRectF KItemListWidget::expansionToggleRect() const
 QPixmap KItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem* option,
                                           QWidget* widget)
 {
 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);
     pixmap.fill(Qt::transparent);
 
     QPainter painter(&pixmap);


@@ -473,7 +474,7 @@ void KItemListWidget::slotHoverAnimationFinished()
 {
     if (!m_hovered && m_selectionToggle) {
         m_selectionToggle->deleteLater();
 {
     if (!m_hovered && m_selectionToggle) {
         m_selectionToggle->deleteLater();

-        m_selectionToggle = 0;
+        m_selectionToggle = nullptr;

     }
 }
 
     }
 }
 


@@ -501,7 +502,7 @@ void KItemListWidget::setHoverOpacity(qreal opacity)
 
     if (m_hoverOpacity <= 0.0) {
         delete m_hoverCache;
 
     if (m_hoverOpacity <= 0.0) {
         delete m_hoverCache;

-        m_hoverCache = 0;
+        m_hoverCache = nullptr;

     }
 
     update();
     }
 
     update();


@@ -510,15 +511,15 @@ void KItemListWidget::setHoverOpacity(qreal opacity)
 void KItemListWidget::clearHoverCache()
 {
     delete m_hoverCache;
 void KItemListWidget::clearHoverCache()
 {
     delete m_hoverCache;

-    m_hoverCache = 0;
+    m_hoverCache = nullptr;

 }
 
 void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QStyle::State styleState)
 {
 }
 
 void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QStyle::State styleState)
 {

-    QStyleOptionViewItemV4 viewItemOption;
+    QStyleOptionViewItem viewItemOption;

     viewItemOption.initFrom(widget);
     viewItemOption.state = styleState;
     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);
     viewItemOption.showDecorationSelected = true;
     viewItemOption.rect = selectionRect().toRect();
     widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);