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

Debugger: Fix copying stack content to clipboard

Browse Source 
Change-Id: I41240e15235a4906439a514fcf56fa1f7ddc8a80
Fixes: QTCREATORBUG-23199
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-11-18 12:41:48 +01:00
parent da25ac6322
commit 5c64d59d8a
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/debugger/stackhandler.cpp
View File

@@ -457,33 +457,31 @@ bool StackHandler::contextMenuEvent(const ItemViewEvent &ev)
void StackHandler::copyContentsToClipboard() void StackHandler::copyContentsToClipboard()
{ {
QString str; const int m = columnCount(QModelIndex());
int n = rowCount();
int m = columnCount(QModelIndex());
QVector<int> largestColumnWidths(m, 0); QVector<int> largestColumnWidths(m, 0);
// First, find the widths of the largest columns, // First, find the widths of the largest columns,
// so that we can print them out nicely aligned. // so that we can print them out nicely aligned.
for (int i = 0; i != n; ++i) { forItemsAtLevel<2>([m, &largestColumnWidths](StackFrameItem *item) {
for (int j = 0; j < m; ++j) { for (int j = 0; j < m; ++j) {
const QModelIndex idx = index(i, j); const int columnWidth = item->data(j, Qt::DisplayRole).toString().size();
const int columnWidth = data(idx, Qt::DisplayRole).toString().size();
if (columnWidth > largestColumnWidths.at(j)) if (columnWidth > largestColumnWidths.at(j))
largestColumnWidths[j] = columnWidth; largestColumnWidths[j] = columnWidth;
} }
} });
for (int i = 0; i != n; ++i) { QString str;
forItemsAtLevel<2>([m, largestColumnWidths, &str](StackFrameItem *item) {
for (int j = 0; j != m; ++j) { for (int j = 0; j != m; ++j) {
QModelIndex idx = index(i, j); const QString columnEntry = item->data(j, Qt::DisplayRole).toString();
const QString columnEntry = data(idx, Qt::DisplayRole).toString();
str += columnEntry; str += columnEntry;
const int difference = largestColumnWidths.at(j) - columnEntry.size(); const int difference = largestColumnWidths.at(j) - columnEntry.size();
// Add one extra space between columns. // Add one extra space between columns.
str += QString().fill(' ', difference > 0 ? difference + 1 : 1); str += QString(qMax(difference, 0) + 1, QChar(' '));
} }
str += '\n'; str += '\n';
} });
QClipboard *clipboard = QApplication::clipboard(); QClipboard *clipboard = QApplication::clipboard();
clipboard->setText(str, QClipboard::Selection); clipboard->setText(str, QClipboard::Selection);
clipboard->setText(str, QClipboard::Clipboard); clipboard->setText(str, QClipboard::Clipboard);