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

Debugger: Fix tooltip expansion behavior

Browse Source 
Task-number: QTCREATORBUG-11404
Change-Id: I7e08cd6b8216ff7dd0069c2a8718f6bb619ede07
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-07-08 17:09:41 +02:00
parent ae39a00908
commit eba095d22a
3 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/debugger/debuggertooltipmanager.cpp
View File

@@ -860,6 +860,29 @@ DebuggerToolTipTreeView::DebuggerToolTipTreeView(QWidget *parent) :
Qt::QueuedConnection);
connect(this, SIGNAL(expanded(QModelIndex)), this, SLOT(computeSize()),
Qt::QueuedConnection);
connect(this, SIGNAL(expanded(QModelIndex)),
SLOT(expandNode(QModelIndex)));
connect(this, SIGNAL(collapsed(QModelIndex)),
SLOT(collapseNode(QModelIndex)));
}
void DebuggerToolTipTreeView::expandNode(const QModelIndex &idx)
{
model()->setData(idx, true, LocalsExpandedRole);
}
void DebuggerToolTipTreeView::collapseNode(const QModelIndex &idx)
{
model()->setData(idx, false, LocalsExpandedRole);
}
void DebuggerToolTipTreeView::handleItemIsExpanded(const QModelIndex &sourceIdx)
{
QSortFilterProxyModel *filterModel = qobject_cast<QSortFilterProxyModel*>(model());
QModelIndex mappedIdx = filterModel ? filterModel->mapFromSource(sourceIdx) : sourceIdx;
if (!isExpanded(mappedIdx))
expand(mappedIdx);
}
QAbstractItemModel *DebuggerToolTipTreeView::swapModel(QAbstractItemModel *newModel)
@@ -869,10 +892,12 @@ QAbstractItemModel *DebuggerToolTipTreeView::swapModel(QAbstractItemModel *newMo
if (previousModel)
previousModel->disconnect(SIGNAL(rowsInserted(QModelIndex,int,int)), this);
setModel(newModel);
//setRootIndex(newModel->index(0, 0));
connect(newModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SLOT(computeSize()), Qt::QueuedConnection);
computeSize();
SLOT(computeSize()), Qt::QueuedConnection);
if (QSortFilterProxyModel *filterModel = qobject_cast<QSortFilterProxyModel*>(newModel)) {
connect(filterModel->sourceModel(), SIGNAL(itemIsExpanded(QModelIndex)),
SLOT(handleItemIsExpanded(QModelIndex)));
}
}
return previousModel;
}