From e1ef7132ad719ee9e16acd0f7a2110021bc86e2f Mon Sep 17 00:00:00 2001 From: Mikaƫl Capelle Date: Mon, 28 Dec 2020 19:08:30 +0100 Subject: Revert to Qt default behavior for auto-collapse on hovering. --- src/modlistview.cpp | 22 +--------------------- src/modlistview.h | 5 ----- 2 files changed, 1 insertion(+), 26 deletions(-) (limited to 'src') diff --git a/src/modlistview.cpp b/src/modlistview.cpp index 0c74c54e..e966ce4e 100644 --- a/src/modlistview.cpp +++ b/src/modlistview.cpp @@ -31,13 +31,8 @@ void ModListView::dragEnterEvent(QDragEnterEvent* event) void ModListView::dragMoveEvent(QDragMoveEvent* event) { - if (autoExpandDelay() >= 0) { - m_openTimer.start(autoExpandDelay(), this); - } - - // bypass QTreeView m_inDragMoveEvent = true; - QAbstractItemView::dragMoveEvent(event); + QTreeView::dragMoveEvent(event); m_inDragMoveEvent = false; } @@ -48,18 +43,3 @@ void ModListView::dropEvent(QDropEvent* event) m_inDragMoveEvent = false; } -void ModListView::timerEvent(QTimerEvent* event) -{ - if (event->timerId() == m_openTimer.timerId()) { - QPoint pos = viewport()->mapFromGlobal(QCursor::pos()); - if (state() == QAbstractItemView::DraggingState - && viewport()->rect().contains(pos)) { - QModelIndex index = indexAt(pos); - setExpanded(index, true); - } - m_openTimer.stop(); - } - else { - QTreeView::timerEvent(event); - } -} diff --git a/src/modlistview.h b/src/modlistview.h index ab604b70..c6d42d2d 100644 --- a/src/modlistview.h +++ b/src/modlistview.h @@ -20,13 +20,8 @@ signals: protected: - // replace the auto-expand timer from QTreeView to avoid - // auto-collapsing - QBasicTimer m_openTimer; - bool m_inDragMoveEvent = false; - void timerEvent(QTimerEvent* event) override; void dragEnterEvent(QDragEnterEvent* event) override; void dragMoveEvent(QDragMoveEvent* event) override; void dropEvent(QDropEvent* event) override; -- cgit v1.3.1