feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Improve keyboard navigation in locals view

Browse Source 
Expanding items in the locals view results in replacing the original
tree item with a newly created one. This ultimately resets the selection
and the current item of the view, which in turn makes it cumbersome to
navigate by keyboard.

Save a list of selected inames and the iname of the current index when
requesting the update and try to reselect them after the update
finished.

Fixes: QTCREATORBUG-27569
Change-Id: I9d8f51631e4ee490e19307877cbef44798506016
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2024-04-29 14:18:12 +02:00
parent 1fc135822f
commit 15e56078b6
3 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/plugins/debugger/watchwindow.cpp
View File

@@ -8,6 +8,7 @@
#include "debuggertr.h"
#include "watchhandler.h"
#include <utils/algorithm.h>
#include <utils/aspects.h>
#include <utils/qtcassert.h>
@@ -29,6 +30,10 @@ WatchTreeView::WatchTreeView(WatchType type)
setAcceptDrops(true);
setDropIndicatorShown(true);
m_progressDelayTimer.setSingleShot(true);
m_progressDelayTimer.setInterval(80);
connect(&m_progressDelayTimer, &QTimer::timeout, this, &WatchTreeView::showProgressIndicator);
connect(this, &QTreeView::expanded, this, &WatchTreeView::expandNode);
connect(this, &QTreeView::collapsed, this, &WatchTreeView::collapseNode);
@@ -71,12 +76,10 @@ void WatchTreeView::setModel(QAbstractItemModel *model)
this, &QAbstractItemView::setCurrentIndex);
connect(watchModel, &WatchModelBase::itemIsExpanded,
this, &WatchTreeView::handleItemIsExpanded);
if (m_type == LocalsType) {
connect(watchModel, &WatchModelBase::updateStarted,
this, &WatchTreeView::showProgressIndicator);
connect(watchModel, &WatchModelBase::updateFinished,
this, &WatchTreeView::hideProgressIndicator);
}
connect(watchModel, &WatchModelBase::updateStarted,
this, &WatchTreeView::handleUpdateStarted);
connect(watchModel, &WatchModelBase::updateFinished,
this, &WatchTreeView::handleUpdateFinished);
updateTimeColumn();
}
@@ -95,6 +98,39 @@ void WatchTreeView::handleItemIsExpanded(const QModelIndex &idx)
expand(idx);
}
void WatchTreeView::handleUpdateStarted()
{
m_selectedInames = Utils::transform(selectedIndexes(), [this](const QModelIndex &idx) {
return model()->data(idx, LocalsINameRole).toString();
});
m_currentIname = currentIndex().data(LocalsINameRole).toString();
if (m_type == LocalsType)
m_progressDelayTimer.start();
}
void WatchTreeView::handleUpdateFinished()
{
m_progressDelayTimer.stop();
if (m_type == LocalsType)
hideProgressIndicator();
auto watchModel = qobject_cast<WatchModelBase *>(model());
QTC_ASSERT(watchModel, return);
QItemSelection selection;
QModelIndex currentIndex;
watchModel->forAllItems([&](Utils::TreeItem *item) {
const QModelIndex index = item->index();
const QString iName = index.data(LocalsINameRole).toString();
if (m_selectedInames.contains(iName))
selection.append(QItemSelectionRange(index));
if (iName == m_currentIname)
currentIndex = index;
});
selectionModel()->select(selection, QItemSelectionModel::Select);
if (currentIndex.isValid())
setCurrentIndex(currentIndex);
}
void WatchTreeView::reexpand(QTreeView *view, const QModelIndex &idx)
{
if (idx.data(LocalsExpandedRole).toBool()) {