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

Debugger: Rework Tooltips. Again.

Browse Source 
Too much layers of complexity. Instead of keeping an eye on
the "live" tree model and switch to a static StandardItemModel
whenever live synchronization is not possible (and do all the
tree view snake oil magic that's needed to make the switch
appear "smooth") keep static copies of relevant parts of the
live model, and update them whenever the the live model changes.

Change-Id: I88a7de67f7703cd2fed041351346b1c7ada0839e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
hjk
2015-02-09 09:00:21 +01:00
parent d24fab71eb
commit 2fe69b60dd
5 changed files with 417 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins/debugger/watchhandler.cpp
View File

@@ -679,7 +679,7 @@ QString WatchItem::expression() const
QString WatchItem::displayName() const
{
QString result;
if (!parent())
if (!parentItem())
return result;
if (d.iname.startsWith("return"))
result = WatchModel::tr("returned value");
@@ -720,6 +720,23 @@ QString WatchItem::displayType() const
return result;
}
QColor WatchItem::color() const
{
static const QColor red(200, 0, 0);
static const QColor gray(140, 140, 140);
if (watchModel()) {
if (!d.valueEnabled)
return gray;
if (!watchModel()->contentIsValid() && !d.isInspect())
return gray;
if (d.value.isEmpty()) // This might still show 0x...
return gray;
if (d.value != watchModel()->m_valueCache.value(d.iname))
return red;
}
return QColor();
}
QVariant WatchItem::data(int column, int role) const
{
switch (role) {
@@ -763,22 +780,9 @@ QVariant WatchItem::data(int column, int role) const
return boolSetting(UseToolTipsInLocalsView)
? d.toToolTip() : QVariant();
case Qt::ForegroundRole: {
static const QVariant red(QColor(200, 0, 0));
static const QVariant gray(QColor(140, 140, 140));
if (column == 1) {
QTC_ASSERT(model(), break);
if (!d.valueEnabled)
return gray;
if (!watchModel()->contentIsValid() && !d.isInspect())
return gray;
if (d.value.isEmpty()) // This might still show 0x...
return gray;
if (d.value != watchModel()->m_valueCache.value(d.iname))
return red;
}
break;
}
case Qt::ForegroundRole:
if (column == 1)
return color();
case LocalsExpressionRole:
return QVariant(expression());
@@ -1109,8 +1113,10 @@ void WatchModel::insertDataItem(const WatchData &data, bool destructive)
newItem->d = data;
const int row = findInsertPosition(parent->children(), newItem);
parent->insertChild(row, newItem);
if (m_expandedINames.contains(parent->d.iname))
if (m_expandedINames.contains(parent->d.iname)) {
emit inameIsExpanded(parent->d.iname);
emit itemIsExpanded(indexFromItem(parent));
}
}
}
@@ -1245,6 +1251,7 @@ void WatchModel::reexpandItems()
foreach (const QByteArray &iname, m_expandedINames) {
WatchItem *item = findItem(iname);
emit itemIsExpanded(indexFromItem(item));
emit inameIsExpanded(iname);
}
}