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

debugger: fix style after previous merge

Browse Source
This commit is contained in:
hjk
2010-10-26 11:08:49 +02:00
parent 356130a78d
commit f77d9dc946
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/debugger/debuggertooltip.cpp
View File

@@ -33,15 +33,15 @@
#include <QtCore/QtDebug> #include <QtCore/QtDebug>
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QDesktopWidget>
#include <QtGui/QHBoxLayout> #include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView> #include <QtGui/QHeaderView>
#include <QtGui/QKeyEvent> #include <QtGui/QKeyEvent>
#include <QtGui/QLabel> #include <QtGui/QLabel>
#include <QtGui/QScrollBar>
#include <QtGui/QTreeView> #include <QtGui/QTreeView>
#include <QtGui/QVBoxLayout> #include <QtGui/QVBoxLayout>
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtGui/QScrollBar>
#include <QtGui/QDesktopWidget>
namespace Debugger { namespace Debugger {
@@ -101,9 +101,8 @@ bool ToolTipWidget::eventFilter(QObject *ob, QEvent *ev)
return true; return true;
break; break;
case QEvent::KeyPress: case QEvent::KeyPress:
if (static_cast<QKeyEvent *>(ev)->key() == Qt::Key_Escape) { if (static_cast<QKeyEvent *>(ev)->key() == Qt::Key_Escape)
return true; return true;
}
break; break;
case QEvent::KeyRelease: case QEvent::KeyRelease:
if (static_cast<QKeyEvent *>(ev)->key() == Qt::Key_Escape) { if (static_cast<QKeyEvent *>(ev)->key() == Qt::Key_Escape) {
@@ -129,7 +128,7 @@ int ToolTipWidget::computeHeight(const QModelIndex &index) const
return s; return s;
} }
Q_SLOT void ToolTipWidget::computeSize() void ToolTipWidget::computeSize()
{ {
int columns = 0; int columns = 0;
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
@@ -138,8 +137,9 @@ Q_SLOT void ToolTipWidget::computeSize()
} }
int rows = computeHeight(QModelIndex()); int rows = computeHeight(QModelIndex());
//Fit tooltip to screen, showing/hiding scrollbars as needed // Fit tooltip to screen, showing/hiding scrollbars as needed.
//Add a bit of space to account for tooltip border, and not touch the border of the screen // Add a bit of space to account for tooltip border, and not
// touch the border of the screen.
QPoint pos(x(), y()); QPoint pos(x(), y());
QRect desktopRect = QApplication::desktop()->availableGeometry(pos); QRect desktopRect = QApplication::desktop()->availableGeometry(pos);
const int maxWidth = desktopRect.right() - pos.x() - 5 - 5; const int maxWidth = desktopRect.right() - pos.x() - 5 - 5;
@@ -152,16 +152,14 @@ Q_SLOT void ToolTipWidget::computeSize()
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
rows = maxHeight; rows = maxHeight;
columns += verticalScrollBar()->width(); columns += verticalScrollBar()->width();
} } else {
else {
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
} }
if (columns > maxWidth) { if (columns > maxWidth) {
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
columns = maxWidth; columns = maxWidth;
} } else {
else {
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
} }