Fix alignment of icons in Places panel and Compact view mode

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

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index b91e871672568e2ef74c18a15ac06df345a60235..28b374620c38ff7fe1122164f8011756a4489faa 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -22,20 +22,25 @@
 
 #include "kitemlistwidget.h"
 
 
 #include "kitemlistwidget.h"
 

-#include "kitemlistselectiontoggle_p.h"

 #include "kitemlistview.h"
 #include "kitemlistview.h"

-#include "kitemmodelbase.h"
+#include "private/kitemlistselectiontoggle.h"

 
 

-#include <KDebug>
-
-#include <KGlobalSettings>

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

-KItemListWidget::KItemListWidget(QGraphicsItem* parent) :
-    QGraphicsWidget(parent, 0),
+KItemListWidgetInformant::KItemListWidgetInformant()
+{
+}
+
+KItemListWidgetInformant::~KItemListWidgetInformant()
+{
+}
+
+KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
+    QGraphicsWidget(parent, nullptr),
+    m_informant(informant),

     m_index(-1),
     m_selected(false),
     m_current(false),
     m_index(-1),
     m_selected(false),
     m_current(false),


@@ -48,9 +53,10 @@ KItemListWidget::KItemListWidget(QGraphicsItem* parent) :
     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()

 {
 }
 
 {
 }
 


@@ -63,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();


@@ -111,7 +117,7 @@ void KItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* o
         painter->fillRect(backgroundRect, backgroundColor);
     }
 
         painter->fillRect(backgroundRect, backgroundColor);
     }
 

-    if (m_selected) {
+    if (m_selected && m_editedRole.isEmpty()) {

         const QStyle::State activeState(isActiveWindow() ? QStyle::State_Active : 0);
         drawItemStyleOption(painter, widget, activeState |
                                              QStyle::State_Enabled |
         const QStyle::State activeState(isActiveWindow() ? QStyle::State_Active : 0);
         drawItemStyleOption(painter, widget, activeState |
                                              QStyle::State_Enabled |


@@ -119,20 +125,10 @@ void KItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* o
                                              QStyle::State_Item);
     }
 
                                              QStyle::State_Item);
     }
 

-    if (isCurrent()) {
+    if (m_current && m_editedRole.isEmpty()) {

         QStyleOptionFocusRect focusRectOption;
         focusRectOption.initFrom(widget);
         QStyleOptionFocusRect focusRectOption;
         focusRectOption.initFrom(widget);

-
-        const QRect iconBounds = iconRect().toRect();
-        const QRect textBounds = textRect().toRect();
-        if (iconBounds.bottom() > textBounds.top()) {
-            focusRectOption.rect = textBounds;
-        } else {
-            // See KItemListWidget::drawItemStyleOption(): The selection rectangle
-            // gets decreased.
-            focusRectOption.rect = textBounds.adjusted(1, 1, -1, -1);
-        }
-
+        focusRectOption.rect = textFocusRect().toRect();

         focusRectOption.state = QStyle::State_Enabled | QStyle::State_Item | QStyle::State_KeyboardFocusChange;
         if (m_selected) {
             focusRectOption.state |= QStyle::State_Selected;
         focusRectOption.state = QStyle::State_Enabled | QStyle::State_Item | QStyle::State_KeyboardFocusChange;
         if (m_selected) {
             focusRectOption.state |= QStyle::State_Selected;


@@ -180,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();


@@ -195,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();
 }


@@ -249,9 +248,9 @@ void KItemListWidget::setHovered(bool hovered)
 
     if (!m_hoverAnimation) {
         m_hoverAnimation = new QPropertyAnimation(this, "hoverOpacity", this);
 
     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);
         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();
 


@@ -278,6 +277,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) {


@@ -318,6 +324,20 @@ QBitArray KItemListWidget::siblingsInformation() const
     return m_siblingsInfo;
 }
 
     return m_siblingsInfo;
 }
 

+void KItemListWidget::setEditedRole(const QByteArray& role)
+{
+    if (m_editedRole != role) {
+        const QByteArray previous = m_editedRole;
+        m_editedRole = role;
+        editedRoleChanged(role, previous);
+    }
+}
+
+QByteArray KItemListWidget::editedRole() const
+{
+    return m_editedRole;
+}
+

 bool KItemListWidget::contains(const QPointF& point) const
 {
     if (!QGraphicsWidget::contains(point)) {
 bool KItemListWidget::contains(const QPointF& point) const
 {
     if (!QGraphicsWidget::contains(point)) {


@@ -330,6 +350,11 @@ bool KItemListWidget::contains(const QPointF& point) const
            selectionToggleRect().contains(point);
 }
 
            selectionToggleRect().contains(point);
 }
 

+QRectF KItemListWidget::textFocusRect() const
+{
+    return textRect();
+}
+

 QRectF KItemListWidget::selectionToggleRect() const
 {
     return QRectF();
 QRectF KItemListWidget::selectionToggleRect() const
 {
     return QRectF();


@@ -340,6 +365,32 @@ QRectF KItemListWidget::expansionToggleRect() const
     return QRectF();
 }
 
     return QRectF();
 }
 

+QPixmap KItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem* option,
+                                          QWidget* widget)
+{
+    QPixmap pixmap(size().toSize() * widget->devicePixelRatio());
+    pixmap.setDevicePixelRatio(widget->devicePixelRatio());
+    pixmap.fill(Qt::transparent);
+
+    QPainter painter(&pixmap);
+
+    const bool oldAlternateBackground = m_alternateBackground;
+    const bool wasSelected = m_selected;
+    const bool wasHovered = m_hovered;
+
+    setAlternateBackground(false);
+    setSelected(false);
+    setHovered(false);
+
+    paint(&painter, option, widget);
+
+    setAlternateBackground(oldAlternateBackground);
+    setSelected(wasSelected);
+    setHovered(wasHovered);
+
+    return pixmap;
+}
+

 void KItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& current,
                                   const QSet<QByteArray>& roles)
 {
 void KItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& current,
                                   const QSet<QByteArray>& roles)
 {


@@ -396,10 +447,22 @@ void KItemListWidget::siblingsInformationChanged(const QBitArray& current, const
     Q_UNUSED(previous);
 }
 
     Q_UNUSED(previous);
 }
 

+void KItemListWidget::editedRoleChanged(const QByteArray& current, const QByteArray& previous)
+{
+    Q_UNUSED(current);
+    Q_UNUSED(previous);
+}
+

 void KItemListWidget::resizeEvent(QGraphicsSceneResizeEvent* event)
 {
     QGraphicsWidget::resizeEvent(event);
     clearHoverCache();
 void KItemListWidget::resizeEvent(QGraphicsSceneResizeEvent* event)
 {
     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


@@ -409,9 +472,9 @@ qreal KItemListWidget::hoverOpacity() const
 
 void KItemListWidget::slotHoverAnimationFinished()
 {
 
 void KItemListWidget::slotHoverAnimationFinished()
 {

-    if (!m_hovered) {
-        delete m_selectionToggle;
-        m_selectionToggle = 0;
+    if (!m_hovered && m_selectionToggle) {
+        m_selectionToggle->deleteLater();
+        m_selectionToggle = nullptr;

     }
 }
 
     }
 }
 


@@ -439,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();


@@ -448,20 +511,17 @@ 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)
 {

-    const QRect textBounds = textRect().toRect();
-
-    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.showDecorationSelected = true;

-    viewItemOption.rect = textBounds.adjusted(1, 0, -1, 0);
+    viewItemOption.rect = selectionRect().toRect();

     widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);
 }
 
     widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);
 }
 

-#include "kitemlistwidget.moc"