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

Debugger: More robust approach for DebuggerToolTipTreeView::computeSize

Browse Source 
model() == 0 should not happen, but the bugreport indicates there
was something wrong at a time.

Task-number: QTCREATORBUG-12692
Change-Id: Ie850dfc1177d968c39ffae74af89ae1bab44703c
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-07-17 17:22:37 +02:00
parent 3ed30f09cf
commit aef20d43e1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/debugger/debuggertooltipmanager.cpp
View File

@@ -999,14 +999,14 @@ int DebuggerToolTipTreeView::computeHeight(const QModelIndex &index) const
void DebuggerToolTipTreeView::computeSize()
{
WatchTreeView::reexpand(this, model()->index(0, 0));
int columns = 30; // Decoration
int rows = 0;
bool rootDecorated = false;
if (model()) {
const int columnCount = model()->columnCount();
rootDecorated = model()->rowCount() > 0;
if (QAbstractItemModel *m = model()) {
WatchTreeView::reexpand(this, m->index(0, 0));
const int columnCount = m->columnCount();
rootDecorated = m->rowCount() > 0;
if (rootDecorated)
for (int i = 0; i < columnCount; ++i) {
resizeColumnToContents(i);
@@ -1020,6 +1020,7 @@ void DebuggerToolTipTreeView::computeSize()
// Add a bit of space to account for tooltip border, and not
// touch the border of the screen.
QPoint pos(x(), y());
QTC_ASSERT(QApplication::desktop(), return);
QRect desktopRect = QApplication::desktop()->availableGeometry(pos);
const int maxWidth = desktopRect.right() - pos.x() - 5 - 5;
const int maxHeight = desktopRect.bottom() - pos.y() - 5 - 5;