forked from qt-creator/qt-creator
Debugger: Report full sizes instead of the elide setup
More direct communication of the meaning. Use 'length' when talking about things like string lengths, and 'size' for sizes in bytes. Task-number: QTCREATORBUG-30065 Change-Id: Ifed84a5dab4ed890973c1abf4d427655eb50a61a Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
@@ -822,12 +822,12 @@ static QString formattedValue(const WatchItem *item)
|
||||
QString v = quoteUnprintable(item->value);
|
||||
|
||||
if (v.endsWith('"')) {
|
||||
if (item->elided) {
|
||||
if (item->valuelen > maxLength) {
|
||||
v.chop(1);
|
||||
v.append("...\"");
|
||||
}
|
||||
int len = item->elided ? item->elided : item->value.length() - 2;
|
||||
v += QString(" (%1)").arg(len > 0 ? QString::number(len) : "unknown length");
|
||||
if (item->valuelen > 0)
|
||||
v += QString(" (%1)").arg(item->valuelen);
|
||||
return v;
|
||||
}
|
||||
|
||||
@@ -1297,7 +1297,7 @@ Qt::ItemFlags WatchModel::flags(const QModelIndex &idx) const
|
||||
// FIXME: Forcing types is not implemented yet.
|
||||
//if (idx.column() == 2)
|
||||
// return editable; // Watcher types can be set by force.
|
||||
if (column == ValueColumn && item->valueEditable && !item->elided)
|
||||
if (column == ValueColumn && item->valueEditable && item->valuelen >= 0)
|
||||
return editable; // Watcher values are sometimes editable.
|
||||
}
|
||||
} else if (item->isLocal()) {
|
||||
@@ -1305,7 +1305,7 @@ Qt::ItemFlags WatchModel::flags(const QModelIndex &idx) const
|
||||
return notEditable;
|
||||
if (isRunning && !m_engine->hasCapability(AddWatcherWhileRunningCapability))
|
||||
return notEditable;
|
||||
if (column == ValueColumn && item->valueEditable && !item->elided)
|
||||
if (column == ValueColumn && item->valueEditable && item->valuelen >= 0)
|
||||
return editable; // Locals values are sometimes editable.
|
||||
if (column == ValueColumn && item->arrayIndex >= 0)
|
||||
return editable;
|
||||
|
||||
Reference in New Issue
Block a user