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 24840724cda08372679b3f5da57ca5e852f60017..28b374620c38ff7fe1122164f8011756a4489faa 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -22,33 +22,41 @@
 
 #include "kitemlistwidget.h"
 
 
 #include "kitemlistwidget.h"
 

-#include "kitemlistselectiontoggle_p.h"

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

-#include "kitemmodelbase.h"
-
-#include <KDebug>
+#include "private/kitemlistselectiontoggle.h"

 
 #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_hovered(false),
     m_index(-1),
     m_selected(false),
     m_current(false),
     m_hovered(false),

-    m_alternatingBackgroundColors(false),
+    m_alternateBackground(false),

     m_enabledSelectionToggle(false),
     m_data(),
     m_visibleRoles(),
     m_enabledSelectionToggle(false),
     m_data(),
     m_visibleRoles(),

-    m_visibleRolesSizes(),
+    m_columnWidths(),

     m_styleOption(),
     m_styleOption(),

+    m_siblingsInfo(),

     m_hoverOpacity(0),
     m_hoverOpacity(0),

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

 {
 }
 
 {
 }
 


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


@@ -91,6 +99,7 @@ void KItemListWidget::setData(const QHash<QByteArray, QVariant>& data,
         }
         dataChanged(m_data, roles);
     }
         }
         dataChanged(m_data, roles);
     }

+    update();

 }
 
 QHash<QByteArray, QVariant> KItemListWidget::data() const
 }
 
 QHash<QByteArray, QVariant> KItemListWidget::data() const


@@ -102,15 +111,13 @@ void KItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* o
 {
     Q_UNUSED(option);
 
 {
     Q_UNUSED(option);
 

-    painter->setRenderHint(QPainter::Antialiasing);
-
-    if (m_alternatingBackgroundColors && (m_index & 0x1)) {
+    if (m_alternateBackground) {

         const QColor backgroundColor = m_styleOption.palette.color(QPalette::AlternateBase);
         const QRectF backgroundRect(0, 0, size().width(), size().height());
         painter->fillRect(backgroundRect, backgroundColor);
     }
 
         const QColor backgroundColor = m_styleOption.palette.color(QPalette::AlternateBase);
         const QRectF backgroundRect(0, 0, size().width(), size().height());
         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 |


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

-    if (isCurrent()) {
-        QStyleOptionViewItemV4 viewItemOption;
-        viewItemOption.initFrom(widget);
-        viewItemOption.rect = textRect().toRect();
-        viewItemOption.state = QStyle::State_Enabled | QStyle::State_Item;
+    if (m_current && m_editedRole.isEmpty()) {
+        QStyleOptionFocusRect focusRectOption;
+        focusRectOption.initFrom(widget);
+        focusRectOption.rect = textFocusRect().toRect();
+        focusRectOption.state = QStyle::State_Enabled | QStyle::State_Item | QStyle::State_KeyboardFocusChange;

         if (m_selected) {
         if (m_selected) {

-            viewItemOption.state |= QStyle::State_Selected;
+            focusRectOption.state |= QStyle::State_Selected;

         }
         }

-        viewItemOption.viewItemPosition = QStyleOptionViewItemV4::OnlyOne;
-        style()->drawPrimitive(QStyle::PE_FrameFocusRect, &viewItemOption, painter, widget);
+
+        style()->drawPrimitive(QStyle::PE_FrameFocusRect, &focusRectOption, painter, widget);

     }
 
     if (m_hoverOpacity > 0.0) {
     }
 
     if (m_hoverOpacity > 0.0) {


@@ -156,7 +163,9 @@ void KItemListWidget::setVisibleRoles(const QList<QByteArray>& roles)
 {
     const QList<QByteArray> previousRoles = m_visibleRoles;
     m_visibleRoles = roles;
 {
     const QList<QByteArray> previousRoles = m_visibleRoles;
     m_visibleRoles = roles;

+

     visibleRolesChanged(roles, previousRoles);
     visibleRolesChanged(roles, previousRoles);

+    update();

 }
 
 QList<QByteArray> KItemListWidget::visibleRoles() const
 }
 
 QList<QByteArray> KItemListWidget::visibleRoles() const


@@ -164,25 +173,33 @@ QList<QByteArray> KItemListWidget::visibleRoles() const
     return m_visibleRoles;
 }
 
     return m_visibleRoles;
 }
 

-void KItemListWidget::setVisibleRolesSizes(const QHash<QByteArray, QSizeF> rolesSizes)
+
+void KItemListWidget::setColumnWidth(const QByteArray& role, qreal width)

 {
 {

-    const QHash<QByteArray, QSizeF> previousRolesSizes = m_visibleRolesSizes;
-    m_visibleRolesSizes = rolesSizes;
-    visibleRolesSizesChanged(rolesSizes, previousRolesSizes);
+    const qreal previousWidth = m_columnWidths.value(role);
+    if (previousWidth != width) {
+        m_columnWidths.insert(role, width);
+        columnWidthChanged(role, width, previousWidth);
+        update();
+    }

 }
 
 }
 

-QHash<QByteArray, QSizeF> KItemListWidget::visibleRolesSizes() const
+qreal KItemListWidget::columnWidth(const QByteArray& role) const

 {
 {

-    return m_visibleRolesSizes;
+    return m_columnWidths.value(role);

 }
 
 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);
     styleOptionChanged(option, previous);

+    update();

 }
 
 const KItemListStyleOption& KItemListWidget::styleOption() const
 }
 
 const KItemListStyleOption& KItemListWidget::styleOption() const


@@ -197,7 +214,6 @@ void KItemListWidget::setSelected(bool selected)
         if (m_selectionToggle) {
             m_selectionToggle->setChecked(selected);
         }
         if (m_selectionToggle) {
             m_selectionToggle->setChecked(selected);
         }

-

         selectedChanged(selected);
         update();
     }
         selectedChanged(selected);
         update();
     }


@@ -212,7 +228,6 @@ void KItemListWidget::setCurrent(bool current)
 {
     if (m_current != current) {
         m_current = current;
 {
     if (m_current != current) {
         m_current = current;

-

         currentChanged(current);
         update();
     }
         currentChanged(current);
         update();
     }


@@ -233,8 +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);

-        m_hoverAnimation->setDuration(200);
-        connect(m_hoverAnimation, SIGNAL(finished()), this, SLOT(slotHoverAnimationFinished()));
+        const int duration = style()->styleHint(QStyle::SH_Widget_Animate) ? 200 : 1;
+        m_hoverAnimation->setDuration(duration);
+        connect(m_hoverAnimation, &QPropertyAnimation::finished, this, &KItemListWidget::slotHoverAnimationFinished);

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


@@ -253,7 +269,6 @@ void KItemListWidget::setHovered(bool hovered)
     m_hoverAnimation->start();
 
     hoveredChanged(hovered);
     m_hoverAnimation->start();
 
     hoveredChanged(hovered);

-

     update();
 }
 
     update();
 }
 


@@ -262,18 +277,25 @@ bool KItemListWidget::isHovered() const
     return m_hovered;
 }
 
     return m_hovered;
 }
 

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

 {
 {

-    if (m_alternatingBackgroundColors != enable) {
-        m_alternatingBackgroundColors = enable;
-        alternatingBackgroundColorsChanged(enable);
+    if (m_alternateBackground != enable) {
+        m_alternateBackground = enable;
+        alternateBackgroundChanged(enable);

         update();
     }
 }
 
         update();
     }
 }
 

-bool KItemListWidget::alternatingBackgroundColors() const
+bool KItemListWidget::alternateBackground() const

 {
 {

-    return m_alternatingBackgroundColors;
+    return m_alternateBackground;

 }
 
 void KItemListWidget::setEnabledSelectionToggle(bool enable)
 }
 
 void KItemListWidget::setEnabledSelectionToggle(bool enable)


@@ -289,6 +311,33 @@ bool KItemListWidget::enabledSelectionToggle() const
     return m_enabledSelectionToggle;
 }
 
     return m_enabledSelectionToggle;
 }
 

+void KItemListWidget::setSiblingsInformation(const QBitArray& siblings)
+{
+    const QBitArray previous = m_siblingsInfo;
+    m_siblingsInfo = siblings;
+    siblingsInformationChanged(m_siblingsInfo, previous);
+    update();
+}
+
+QBitArray KItemListWidget::siblingsInformation() const
+{
+    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)) {


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


@@ -311,12 +365,37 @@ 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)
 {
     Q_UNUSED(current);
     Q_UNUSED(roles);
 void KItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& current,
                                   const QSet<QByteArray>& roles)
 {
     Q_UNUSED(current);
     Q_UNUSED(roles);

-    update();

 }
 
 void KItemListWidget::visibleRolesChanged(const QList<QByteArray>& current,
 }
 
 void KItemListWidget::visibleRolesChanged(const QList<QByteArray>& current,


@@ -324,15 +403,15 @@ void KItemListWidget::visibleRolesChanged(const QList<QByteArray>& current,
 {
     Q_UNUSED(current);
     Q_UNUSED(previous);
 {
     Q_UNUSED(current);
     Q_UNUSED(previous);

-    update();

 }
 
 }
 

-void KItemListWidget::visibleRolesSizesChanged(const QHash<QByteArray, QSizeF>& current,
-                                               const QHash<QByteArray, QSizeF>& previous)
+void KItemListWidget::columnWidthChanged(const QByteArray& role,
+                                         qreal current,
+                                         qreal previous)

 {
 {

+    Q_UNUSED(role);

     Q_UNUSED(current);
     Q_UNUSED(previous);
     Q_UNUSED(current);
     Q_UNUSED(previous);

-    update();

 }
 
 void KItemListWidget::styleOptionChanged(const KItemListStyleOption& current,
 }
 
 void KItemListWidget::styleOptionChanged(const KItemListStyleOption& current,


@@ -340,7 +419,6 @@ void KItemListWidget::styleOptionChanged(const KItemListStyleOption& current,
 {
     Q_UNUSED(current);
     Q_UNUSED(previous);
 {
     Q_UNUSED(current);
     Q_UNUSED(previous);

-    update();

 }
 
 void KItemListWidget::currentChanged(bool current)
 }
 
 void KItemListWidget::currentChanged(bool current)


@@ -358,15 +436,33 @@ void KItemListWidget::hoveredChanged(bool hovered)
     Q_UNUSED(hovered);
 }
 
     Q_UNUSED(hovered);
 }
 

-void KItemListWidget::alternatingBackgroundColorsChanged(bool enabled)
+void KItemListWidget::alternateBackgroundChanged(bool enabled)

 {
     Q_UNUSED(enabled);
 }
 
 {
     Q_UNUSED(enabled);
 }
 

+void KItemListWidget::siblingsInformationChanged(const QBitArray& current, const QBitArray& previous)
+{
+    Q_UNUSED(current);
+    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


@@ -376,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;

     }
 }
 
     }
 }
 


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


@@ -415,32 +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 iconBounds = iconRect().toRect();
-    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;
-
-    const bool drawMerged = (iconBounds.top()    == textBounds.top() &&
-                             iconBounds.bottom() == textBounds.bottom());
-
-    if (drawMerged) {
-        viewItemOption.rect = iconBounds | textBounds;
-        widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);
-    } else {
-        viewItemOption.rect = iconBounds;
-        widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);
-
-        viewItemOption.rect = textBounds.adjusted(2, 2, -2, -2);
-        widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);
-    }
+    viewItemOption.viewItemPosition = QStyleOptionViewItem::OnlyOne;
+    viewItemOption.showDecorationSelected = true;
+    viewItemOption.rect = selectionRect().toRect();
+    widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);

 }
 
 }
 

-#include "kitemlistwidget.moc"