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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Change-Id: Ieb0bb1ebab9a5efb42d15bbeac2cd4c46a6de962
This commit is contained in:
Eike Ziller
2019-12-18 09:02:56 +01:00
parent ef680f547c 546d4a3b1a
commit e16876df0c
30 changed files with 231 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1695,21 +1695,25 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev)
addAction(menu, tr("Expand All Children"),
item,
[this, item] {
m_expandedINames.insert(item->iname);
item->forFirstLevelChildren([this](WatchItem *child) {
m_expandedINames.insert(child->iname);
});
m_engine->updateLocals();
[this, name = item->iname] {
m_expandedINames.insert(name);
if (auto item = findItem(name)) {
item->forFirstLevelChildren([this](WatchItem *child) {
m_expandedINames.insert(child->iname);
});
m_engine->updateLocals();
}
});
addAction(menu, tr("Collapse All Children"),
item,
[this, item] {
item->forFirstLevelChildren([this](WatchItem *child) {
m_expandedINames.remove(child->iname);
});
m_engine->updateLocals();
[this, name = item->iname] {
if (auto item = findItem(name)) {
item->forFirstLevelChildren([this](WatchItem *child) {
m_expandedINames.remove(child->iname);
});
m_engine->updateLocals();
}
});
addAction(menu, tr("Close Editor Tooltips"),
@@ -1722,7 +1726,10 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev)
addAction(menu, tr("Copy Current Value to Clipboard"),
item,
[item] { copyToClipboard(item->value); });
[this, name = item->iname] {
if (auto item = findItem(name))
copyToClipboard(item->value);
});
// addAction(menu, tr("Copy Selected Rows to Clipboard"),
// selectionModel()->hasSelection(),