Make touch tap to select items work in selection mode

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

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index fce06a53f0b6f50b566afcf0f1d3a2805e47558b..5541aa9f89f811658004c67d9a4f48c97730d9d5 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -11,6 +11,9 @@
 #include "kitemlistview.h"
 #include "private/kitemlistselectiontoggle.h"
 
 #include "kitemlistview.h"
 #include "private/kitemlistselectiontoggle.h"
 

+#include <KConfigGroup>
+#include <KSharedConfig>
+

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


@@ -31,6 +34,7 @@ KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsI
     m_selected(false),
     m_current(false),
     m_hovered(false),
     m_selected(false),
     m_current(false),
     m_hovered(false),

+    m_expansionAreaHovered(false),

     m_alternateBackground(false),
     m_enabledSelectionToggle(false),
     m_data(),
     m_alternateBackground(false),
     m_enabledSelectionToggle(false),
     m_data(),


@@ -41,9 +45,12 @@ KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsI
     m_hoverOpacity(0),
     m_hoverCache(nullptr),
     m_hoverAnimation(nullptr),
     m_hoverOpacity(0),
     m_hoverCache(nullptr),
     m_hoverAnimation(nullptr),

+    m_hoverSequenceIndex(0),

     m_selectionToggle(nullptr),
     m_selectionToggle(nullptr),

-    m_editedRole()
+    m_editedRole(),
+    m_iconSize(-1)

 {
 {

+    connect(&m_hoverSequenceTimer, &QTimer::timeout, this, &KItemListWidget::slotHoverSequenceTimerTimeout);

 }
 
 KItemListWidget::~KItemListWidget()
 }
 
 KItemListWidget::~KItemListWidget()


@@ -80,7 +87,7 @@ void KItemListWidget::setData(const QHash<QByteArray, QVariant>& data,
         m_data = data;
         dataChanged(m_data);
     } else {
         m_data = data;
         dataChanged(m_data);
     } else {

-        foreach (const QByteArray& role, roles) {
+        for (const QByteArray& role : roles) {

             m_data[role] = data[role];
         }
         dataChanged(m_data, roles);
             m_data[role] = data[role];
         }
         dataChanged(m_data, roles);


@@ -175,6 +182,18 @@ qreal KItemListWidget::columnWidth(const QByteArray& role) const
     return m_columnWidths.value(role);
 }
 
     return m_columnWidths.value(role);
 }
 

+qreal KItemListWidget::sidePadding() const {
+    return m_sidePadding;
+}
+
+void KItemListWidget::setSidePadding(qreal width) {
+    if (m_sidePadding != width){
+        m_sidePadding = width;
+        sidePaddingChanged(width);
+        update();
+    }
+}
+

 void KItemListWidget::setStyleOption(const KItemListStyleOption& option)
 {
     if (m_styleOption == option) {
 void KItemListWidget::setStyleOption(const KItemListStyleOption& option)
 {
     if (m_styleOption == option) {


@@ -240,6 +259,8 @@ void KItemListWidget::setHovered(bool hovered)
     }
     m_hoverAnimation->stop();
 
     }
     m_hoverAnimation->stop();
 

+    m_hoverSequenceIndex = 0;
+

     if (hovered) {
         const qreal startValue = qMax(hoverOpacity(), qreal(0.1));
         m_hoverAnimation->setStartValue(startValue);
     if (hovered) {
         const qreal startValue = qMax(hoverOpacity(), qreal(0.1));
         m_hoverAnimation->setStartValue(startValue);


@@ -247,9 +268,19 @@ void KItemListWidget::setHovered(bool hovered)
         if (m_enabledSelectionToggle && !(QApplication::mouseButtons() & Qt::LeftButton)) {
             initializeSelectionToggle();
         }
         if (m_enabledSelectionToggle && !(QApplication::mouseButtons() & Qt::LeftButton)) {
             initializeSelectionToggle();
         }

+
+        hoverSequenceStarted();
+
+        const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
+        const int interval = globalConfig.readEntry("HoverSequenceInterval", 700);
+
+        m_hoverSequenceTimer.start(interval);

     } else {
         m_hoverAnimation->setStartValue(hoverOpacity());
         m_hoverAnimation->setEndValue(0.0);
     } else {
         m_hoverAnimation->setStartValue(hoverOpacity());
         m_hoverAnimation->setEndValue(0.0);

+
+        hoverSequenceEnded();
+        m_hoverSequenceTimer.stop();

     }
 
     m_hoverAnimation->start();
     }
 
     m_hoverAnimation->start();


@@ -263,6 +294,20 @@ bool KItemListWidget::isHovered() const
     return m_hovered;
 }
 
     return m_hovered;
 }
 

+void KItemListWidget::setExpansionAreaHovered(bool hovered)
+{
+    if (hovered == m_expansionAreaHovered) {
+        return;
+    }
+    m_expansionAreaHovered = hovered;
+    update();
+}
+
+bool KItemListWidget::expansionAreaHovered() const
+{
+    return m_expansionAreaHovered;
+}
+

 void KItemListWidget::setHoverPosition(const QPointF& pos)
 {
     if (m_selectionToggle) {
 void KItemListWidget::setHoverPosition(const QPointF& pos)
 {
     if (m_selectionToggle) {


@@ -324,6 +369,20 @@ QByteArray KItemListWidget::editedRole() const
     return m_editedRole;
 }
 
     return m_editedRole;
 }
 

+void KItemListWidget::setIconSize(int iconSize)
+{
+    if (m_iconSize != iconSize) {
+        const int previousIconSize = m_iconSize;
+        m_iconSize = iconSize;
+        iconSizeChanged(iconSize, previousIconSize);
+    }
+}
+
+int KItemListWidget::iconSize() const
+{
+    return m_iconSize;
+}
+

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


@@ -399,11 +458,20 @@ void KItemListWidget::columnWidthChanged(const QByteArray& role,
     Q_UNUSED(previous)
 }
 
     Q_UNUSED(previous)
 }
 

+void KItemListWidget::sidePaddingChanged(qreal width)
+{
+    Q_UNUSED(width)
+}
+

 void KItemListWidget::styleOptionChanged(const KItemListStyleOption& current,
                                          const KItemListStyleOption& previous)
 {
 void KItemListWidget::styleOptionChanged(const KItemListStyleOption& current,
                                          const KItemListStyleOption& previous)
 {

-    Q_UNUSED(current)

     Q_UNUSED(previous)
     Q_UNUSED(previous)

+
+    // set the initial value of m_iconSize if not set
+    if (m_iconSize == -1) {
+        m_iconSize = current.iconSize;
+    }

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


@@ -438,6 +506,12 @@ void KItemListWidget::editedRoleChanged(const QByteArray& current, const QByteAr
     Q_UNUSED(previous)
 }
 
     Q_UNUSED(previous)
 }
 

+void KItemListWidget::iconSizeChanged(int current, int previous)
+{
+    Q_UNUSED(current)
+    Q_UNUSED(previous)
+}
+

 void KItemListWidget::resizeEvent(QGraphicsSceneResizeEvent* event)
 {
     QGraphicsWidget::resizeEvent(event);
 void KItemListWidget::resizeEvent(QGraphicsSceneResizeEvent* event)
 {
     QGraphicsWidget::resizeEvent(event);


@@ -450,11 +524,29 @@ void KItemListWidget::resizeEvent(QGraphicsSceneResizeEvent* event)
     }
 }
 
     }
 }
 

+void KItemListWidget::hoverSequenceStarted()
+{
+}
+
+void KItemListWidget::hoverSequenceIndexChanged(int sequenceIndex)
+{
+    Q_UNUSED(sequenceIndex);
+}
+
+void KItemListWidget::hoverSequenceEnded()
+{
+}
+

 qreal KItemListWidget::hoverOpacity() const
 {
     return m_hoverOpacity;
 }
 
 qreal KItemListWidget::hoverOpacity() const
 {
     return m_hoverOpacity;
 }
 

+int KItemListWidget::hoverSequenceIndex() const
+{
+    return m_hoverSequenceIndex;
+}
+

 void KItemListWidget::slotHoverAnimationFinished()
 {
     if (!m_hovered && m_selectionToggle) {
 void KItemListWidget::slotHoverAnimationFinished()
 {
     if (!m_hovered && m_selectionToggle) {


@@ -463,6 +555,12 @@ void KItemListWidget::slotHoverAnimationFinished()
     }
 }
 
     }
 }
 

+void KItemListWidget::slotHoverSequenceTimerTimeout()
+{
+    m_hoverSequenceIndex++;
+    hoverSequenceIndexChanged(m_hoverSequenceIndex);
+}
+

 void KItemListWidget::initializeSelectionToggle()
 {
     Q_ASSERT(m_enabledSelectionToggle);
 void KItemListWidget::initializeSelectionToggle()
 {
     Q_ASSERT(m_enabledSelectionToggle);