Use different times for auto-expand vs. auto-collapse of sidebar items

This improves usability on laptop touchpads and other devices where
accurate movements while holding down the mouse button are difficult.

Author: cr7pt0gr4ph7

src/library/library.cpp

@@ -343,7 +343,11 @@ void Library::bindSidebarWidget(WLibrarySidebar* pSidebarWidget) {
             m_pConfig->getValue(
                     kSidebarHoverExpandDelayConfigKey,
                     kSidebarHoverExpandDelayDefault);
-    pSidebarWidget->slotSetExpandOnHoverDelay(sidebarHoverExpandDelay);
+    const auto sidebarHoverCollapseDelay =
+            m_pConfig->getValue(
+                    kSidebarHoverCollapseDelayConfigKey,
+                    kSidebarHoverCollapseDelayDefault);
+    pSidebarWidget->slotSetExpandCollapseOnHoverDelay(sidebarHoverExpandDelay, sidebarHoverCollapseDelay);
 
     m_pLibraryControl->bindSidebarWidget(pSidebarWidget);
 
@@ -392,9 +396,9 @@ void Library::bindSidebarWidget(WLibrarySidebar* pSidebarWidget) {
             &WLibrarySidebar::slotSetFont);
 
     connect(this,
-            &Library::setSidebarHoverExpandDelay,
+            &Library::setSidebarHoverDelay,
             pSidebarWidget,
-            &WLibrarySidebar::slotSetExpandOnHoverDelay);
+            &WLibrarySidebar::slotSetExpandCollapseOnHoverDelay);
 
     for (const auto& feature : std::as_const(m_features)) {
         feature->bindSidebarWidget(pSidebarWidget);

src/library/library.h

@@ -175,7 +175,7 @@ class Library: public QObject {
     void setTrackTableRowHeight(int rowHeight);
     void setSelectedClick(bool enable);
 
-    void setSidebarHoverExpandDelay(int delay);
+    void setSidebarHoverDelay(int expandDelay, int collapseDelay);
 
     void onTrackAnalyzerProgress(TrackId trackId, AnalyzerProgress analyzerProgress);
 

src/library/library_prefs.cpp

@@ -129,3 +129,8 @@ const ConfigKey mixxx::library::prefs::kSidebarHoverExpandDelayConfigKey =
         ConfigKey{
                 mixxx::library::prefs::kConfigGroup,
                 QStringLiteral("sidebar_hover_expand_delay")};
+
+const ConfigKey mixxx::library::prefs::kSidebarHoverCollapseDelayConfigKey =
+        ConfigKey{
+                mixxx::library::prefs::kConfigGroup,
+                QStringLiteral("sidebar_hover_collapse_delay")};

src/library/library_prefs.h

@@ -66,6 +66,10 @@ const int kSidebarHoverExpandDelayDefault = 500; // ms
 
 extern const ConfigKey kSidebarHoverExpandDelayConfigKey;
 
+const int kSidebarHoverCollapseDelayDefault = 750; // ms
+
+extern const ConfigKey kSidebarHoverCollapseDelayConfigKey;
+
 } // namespace prefs
 
 } // namespace library

src/preferences/dialog/dlgpreflibrary.cpp

@@ -300,6 +300,7 @@ void DlgPrefLibrary::slotResetToDefaults() {
     }
 
     spinBox_sidebar_hover_expand_delay->setValue(kSidebarHoverExpandDelayDefault);
+    spinBox_sidebar_hover_collapse_delay->setValue(kSidebarHoverCollapseDelayDefault);
 
     checkBox_show_rhythmbox->setChecked(true);
     checkBox_show_banshee->setChecked(true);
@@ -464,6 +465,12 @@ void DlgPrefLibrary::slotUpdate() {
                     kSidebarHoverExpandDelayConfigKey,
                     kSidebarHoverExpandDelayDefault);
     spinBox_sidebar_hover_expand_delay->setValue(sidebarHoverExpandDelay);
+
+    const auto sidebarHoverCollapseDelay =
+            m_pConfig->getValue(
+                    kSidebarHoverCollapseDelayConfigKey,
+                    kSidebarHoverCollapseDelayDefault);
+    spinBox_sidebar_hover_collapse_delay->setValue(sidebarHoverCollapseDelay);
 }
 
 void DlgPrefLibrary::slotCancel() {
@@ -684,8 +691,10 @@ void DlgPrefLibrary::slotApply() {
             ConfigValue(checkbox_played_track_color->isChecked()));
 
     int sidebarHoverExpandDelay = spinBox_sidebar_hover_expand_delay->value();
+    int sidebarHoverCollapseDelay = spinBox_sidebar_hover_collapse_delay->value();
     m_pConfig->setValue(kSidebarHoverExpandDelayConfigKey, sidebarHoverExpandDelay);
-    emit m_pLibrary->setSidebarHoverExpandDelay(sidebarHoverExpandDelay);
+    m_pConfig->setValue(kSidebarHoverCollapseDelayConfigKey, sidebarHoverCollapseDelay);
+    emit m_pLibrary->setSidebarHoverDelay(sidebarHoverExpandDelay, sidebarHoverCollapseDelay);
 
     // TODO(rryan): Don't save here.
     m_pConfig->save();

src/preferences/dialog/dlgpreflibrarydlg.ui

@@ -444,7 +444,40 @@
          <string> ms</string>
         </property>
         <property name="toolTip">
-         <string>The delay until sidebar items are expanded or collapsed hovered during drag'n'drop. -1 disables auto-expand.</string>
+         <string>The delay until sidebar items are expanded hovered during drag'n'drop. -1 disables auto-expand.</string>
+        </property>
+        <property name="minimum">
+         <number>-1</number>
+        </property>
+        <property name="maximum">
+         <number>5000</number>
+        </property>
+        <property name="singleStep">
+         <number>50</number>
+        </property>
+       </widget>
+      </item>
+
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_sidebar_hover_collapse_delay">
+        <property name="text">
+         <string>Hover collapse delay:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+        <property name="buddy">
+         <cstring>spinBox_sidebar_hover_collapse_delay</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2">
+       <widget class="QSpinBox" name="spinBox_sidebar_hover_collapse_delay">
+        <property name="suffix">
+         <string> ms</string>
+        </property>
+        <property name="toolTip">
+         <string>The delay until sidebar items are collapsed hovered during drag'n'drop. -1 disables auto-expand.</string>
         </property>
         <property name="minimum">
          <number>-1</number>

src/widget/wlibrarysidebar.cpp

@@ -13,7 +13,8 @@
 WLibrarySidebar::WLibrarySidebar(QWidget* parent)
         : QTreeView(parent),
           WBaseWidget(this),
-          m_hoverExpandDelay(mixxx::library::prefs::kSidebarHoverExpandDelayDefault) {
+          m_hoverExpandDelay(mixxx::library::prefs::kSidebarHoverExpandDelayDefault),
+          m_hoverCollapseDelay(mixxx::library::prefs::kSidebarHoverCollapseDelayDefault) {
     qRegisterMetaType<FocusWidget>("FocusWidget");
     //Set some properties
     setHeaderHidden(true);
@@ -136,6 +137,11 @@ void WLibrarySidebar::dragMoveEvent(QDragMoveEvent* pEvent) {
 
     if (m_autoExpandIndex != index) {
         m_autoExpandIndex = index;
+        if (isExpanded(index)) {
+            setAutoExpandDelay(m_hoverCollapseDelay);
+        } else {
+            setAutoExpandDelay(m_hoverExpandDelay);
+        }
         // QTreeView::dragMoveEvent just restarts the autoExpand timer
         // and then calls QAbstractItemView::dragMoveEvent
         setSourceOfCurrentDragDropEvent(pEvent->source());
@@ -477,7 +483,7 @@ void WLibrarySidebar::slotSetFont(const QFont& font) {
     setIconSize(QSize(iconSize, iconSize));
 }
 
-void WLibrarySidebar::slotSetExpandOnHoverDelay(int delay) {
-    m_hoverExpandDelay = delay;
-    setAutoExpandDelay(m_hoverExpandDelay);
+void WLibrarySidebar::slotSetExpandCollapseOnHoverDelay(int expandDelay, int collapseDelay) {
+    m_hoverExpandDelay = expandDelay;
+    m_hoverCollapseDelay = collapseDelay;
 }

src/widget/wlibrarysidebar.h

@@ -33,7 +33,7 @@ class WLibrarySidebar : public QTreeView, public WBaseWidget {
     void selectIndex(const QModelIndex& index, bool scrollToIndex = true);
     void selectChildIndex(const QModelIndex&, bool selectItem = true);
     void slotSetFont(const QFont& font);
-    void slotSetExpandOnHoverDelay(int delay);
+    void slotSetExpandCollapseOnHoverDelay(int expandDelay, int collapseDelay);
 
   signals:
     void rightClicked(const QPoint&, const QModelIndex&);
@@ -53,5 +53,6 @@ class WLibrarySidebar : public QTreeView, public WBaseWidget {
     void setSourceOfCurrentDragDropEvent(QObject* pSource);
 
     int m_hoverExpandDelay;
+    int m_hoverCollapseDelay;
     QModelIndex m_autoExpandIndex;
 };