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

[Valgrind] Use standard font for currently selected memcheck entry.

Browse Source 
The current item was displayed using the hardcoded "monospace" font, so that the current/system
font and size was not used. We now use start with the same font as the error list, and simply
activate 'fixedPitch'.

Change-Id: Ifcf6f0fc044e47b3a57281f6af2d70b7f1c618e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Francois Ferrand
2014-09-05 16:12:15 +02:00
parent 87bcfab099
commit 9c1f44e942
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/valgrind/memcheckerrorview.cpp
View File

@@ -94,7 +94,7 @@ private slots:
private: private:
// the constness of this function is a necessary lie because it is called from paint() const. // the constness of this function is a necessary lie because it is called from paint() const.
QWidget *createDetailsWidget(const QModelIndex &errorIndex, QWidget *parent) const; QWidget *createDetailsWidget(const QFont &font, const QModelIndex &errorIndex, QWidget *parent) const;
static const int s_itemMargin = 2; static const int s_itemMargin = 2;
mutable QPersistentModelIndex m_detailsIndex; mutable QPersistentModelIndex m_detailsIndex;
@@ -128,7 +128,7 @@ QSize MemcheckErrorDelegate::sizeHint(const QStyleOptionViewItem &opt, const QMo
} }
if (!m_detailsWidget) { if (!m_detailsWidget) {
m_detailsWidget = createDetailsWidget(index, view->viewport()); m_detailsWidget = createDetailsWidget(opt.font, index, view->viewport());
QTC_ASSERT(m_detailsWidget->parent() == view->viewport(), QTC_ASSERT(m_detailsWidget->parent() == view->viewport(),
m_detailsWidget->setParent(view->viewport())); m_detailsWidget->setParent(view->viewport()));
m_detailsIndex = index; m_detailsIndex = index;
@@ -213,7 +213,7 @@ static QString errorLocation(const QModelIndex &index, const Error &error,
link, linkAttr)); link, linkAttr));
} }
QWidget *MemcheckErrorDelegate::createDetailsWidget(const QModelIndex &errorIndex, QWidget *parent) const QWidget *MemcheckErrorDelegate::createDetailsWidget(const QFont & font, const QModelIndex &errorIndex, QWidget *parent) const
{ {
QWidget *widget = new QWidget(parent); QWidget *widget = new QWidget(parent);
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
@@ -269,7 +269,10 @@ QWidget *MemcheckErrorDelegate::createDetailsWidget(const QModelIndex &errorInde
p.setBrush(QPalette::Base, p.alternateBase()); p.setBrush(QPalette::Base, p.alternateBase());
frameLabel->setPalette(p); frameLabel->setPalette(p);
} }
frameLabel->setFont(QFont(QLatin1String("monospace")));
QFont fixedPitchFont = font;
fixedPitchFont.setFixedPitch(true);
frameLabel->setFont(fixedPitchFont);
connect(frameLabel, SIGNAL(linkActivated(QString)), SLOT(openLinkInEditor(QString))); connect(frameLabel, SIGNAL(linkActivated(QString)), SLOT(openLinkInEditor(QString)));
// pad frameNr to 2 chars since only 50 frames max are supported by valgrind // pad frameNr to 2 chars since only 50 frames max are supported by valgrind
const QString displayText = displayTextTemplate const QString displayText = displayTextTemplate