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

Debugger: Split Expressions view into dock of its own

Browse Source 
Change-Id: Ie86a5bd72c3140219f925835a065d9f6a3ae0ea4
Task-number: QTCREATORBUG-19167
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-10-26 16:32:48 +02:00
parent 0e1953a0f4
commit 78513ecd8f
15 changed files with 112 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1127,7 +1127,7 @@ bool WatchModel::setData(const QModelIndex &idx, const QVariant &value, int role
m_expandedINames.remove(item->iname);
}
if (item->iname.contains('.'))
m_handler->updateWatchersWindow();
m_handler->updateLocalsWindow();
return true;
case LocalsTypeFormatRole:
@@ -2086,7 +2086,7 @@ void WatchHandler::notifyUpdateStarted(const UpdateParameters &updateParameters)
m_model->m_requestUpdateTimer.start(80);
m_model->m_contentsValid = false;
updateWatchersWindow();
updateLocalsWindow();
}
void WatchHandler::notifyUpdateFinished()
@@ -2111,7 +2111,7 @@ void WatchHandler::notifyUpdateFinished()
});
m_model->m_contentsValid = true;
updateWatchersWindow();
updateLocalsWindow();
m_model->reexpandItems();
m_model->m_requestUpdateTimer.stop();
emit m_model->updateFinished();
@@ -2130,7 +2130,7 @@ void WatchModel::removeWatchItem(WatchItem *item)
saveWatchers();
}
destroyItem(item);
m_handler->updateWatchersWindow();
m_handler->updateLocalsWindow();
}
QString WatchHandler::watcherName(const QString &exp)
@@ -2162,7 +2162,8 @@ void WatchHandler::watchExpression(const QString &exp, const QString &name, bool
} else {
m_model->m_engine->updateWatchData(item->iname);
}
updateWatchersWindow();
updateLocalsWindow();
Internal::raiseWatchersWindow();
}
void WatchHandler::updateWatchExpression(WatchItem *item, const QString &newExp)
@@ -2184,7 +2185,7 @@ void WatchHandler::updateWatchExpression(WatchItem *item, const QString &newExp)
} else {
m_model->m_engine->updateWatchData(item->iname);
}
updateWatchersWindow();
updateLocalsWindow();
}
// Watch something obtained from the editor.
@@ -2340,16 +2341,14 @@ void WatchModel::clearWatches()
m_watchRoot->removeChildren();
theWatcherNames.clear();
theWatcherCount = 0;
m_handler->updateWatchersWindow();
saveWatchers();
}
void WatchHandler::updateWatchersWindow()
void WatchHandler::updateLocalsWindow()
{
// Force show/hide of watchers and return view.
int showWatch = !theWatcherNames.isEmpty();
int showReturn = m_model->m_returnRoot->childCount() != 0;
Internal::updateWatchersWindow(showWatch, showReturn);
// Force show/hide of return view.
bool showReturn = m_model->m_returnRoot->childCount() != 0;
Internal::updateLocalsWindow(showReturn);
}
QStringList WatchHandler::watchedExpressions()