dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AutoExpandingTreeView: Scroll if cursor is out of visible area

Browse Source 
Fixes #1489
This commit is contained in:
Jonas Kvinge
2025-12-17 23:14:57 +01:00
parent 1c2e87b741
commit 9a513a9a56
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/widgets/autoexpandingtreeview.cpp
View File

@@ -2,7 +2,7 @@
* Strawberry Music Player * Strawberry Music Player
* This file was part of Clementine. * This file was part of Clementine.
* Copyright 2010, David Sansome <me@davidsansome.com> * Copyright 2010, David Sansome <me@davidsansome.com>
* Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net> * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
* *
* Strawberry is free software: you can redistribute it and/or modify * Strawberry is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -191,3 +191,26 @@ void AutoExpandingTreeView::DownAndFocus() {
setCurrentIndex(moveCursor(QAbstractItemView::MoveDown, Qt::NoModifier)); setCurrentIndex(moveCursor(QAbstractItemView::MoveDown, Qt::NoModifier));
setFocus(); setFocus();
} }
void AutoExpandingTreeView::currentChanged(const QModelIndex &current_index, const QModelIndex &previous_index) {
QTreeView::currentChanged(current_index, previous_index);
// Ensure the newly selected item is visible after keyboard navigation.
// This fixes the issue where the cursor highlight disappears off-screen when using arrow keys to navigate through expanded lists.
if (current_index.isValid()) {
const QRect current_index_rect = visualRect(current_index);
const QRect viewport_rect = viewport()->rect();
// Calculate if we need to scroll to keep the item visible
// If the item extends below the viewport, scroll it to the bottom
// If the item extends above the viewport, scroll it to the top
if (current_index_rect.bottom() > viewport_rect.bottom()) {
scrollTo(current_index, QAbstractItemView::PositionAtBottom);
}
else if (current_index_rect.top() < viewport_rect.top()) {
scrollTo(current_index, QAbstractItemView::PositionAtTop);
}
}
}

3
src/widgets/autoexpandingtreeview.h
View File

@@ -2,7 +2,7 @@
* Strawberry Music Player * Strawberry Music Player
* This file was part of Clementine. * This file was part of Clementine.
* Copyright 2010, David Sansome <me@davidsansome.com> * Copyright 2010, David Sansome <me@davidsansome.com>
* Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net> * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
* *
* Strawberry is free software: you can redistribute it and/or modify * Strawberry is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -55,6 +55,7 @@ class AutoExpandingTreeView : public QTreeView {
protected: protected:
// QAbstractItemView // QAbstractItemView
void reset() override; void reset() override;
void currentChanged(const QModelIndex &current_index, const QModelIndex &previous_index) override;
// QWidget // QWidget
void mousePressEvent(QMouseEvent *event) override; void mousePressEvent(QMouseEvent *event) override;