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

Fixed the bold-line-numbers-cut-off problem in the text editor

Browse Source
This commit is contained in:
mae
2009-08-20 16:13:24 +02:00
parent e6cd5ffaa9
commit 2f69bedc5f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -2253,13 +2253,19 @@ int BaseTextEditor::extraAreaWidth(int *markWidthPtr) const
const QFontMetrics fm(d->m_extraArea->fontMetrics()); const QFontMetrics fm(d->m_extraArea->fontMetrics());
if (d->m_lineNumbersVisible) { if (d->m_lineNumbersVisible) {
QFont fnt = d->m_extraArea->font();
// this works under the assumption that bold or italic can only make a font wider
fnt.setBold(d->m_currentLineNumberFormat.font().bold());
fnt.setItalic(d->m_currentLineNumberFormat.font().italic());
const QFontMetrics linefm(fnt);
int digits = 2; int digits = 2;
int max = qMax(1, blockCount()); int max = qMax(1, blockCount());
while (max >= 100) { while (max >= 100) {
max /= 10; max /= 10;
++digits; ++digits;
} }
space += fm.width(QLatin1Char('9')) * digits; space += linefm.width(QLatin1Char('9')) * digits;
} }
int markWidth = 0; int markWidth = 0;
@@ -2332,7 +2338,7 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
QPalette pal = d->m_extraArea->palette(); QPalette pal = d->m_extraArea->palette();
pal.setCurrentColorGroup(QPalette::Active); pal.setCurrentColorGroup(QPalette::Active);
QPainter painter(d->m_extraArea); QPainter painter(d->m_extraArea);
QFontMetrics fm(painter.fontMetrics()); const QFontMetrics fm(d->m_extraArea->font());
int fmLineSpacing = fm.lineSpacing(); int fmLineSpacing = fm.lineSpacing();
int markWidth = 0; int markWidth = 0;