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

textedit: make whitespace visualization work with overwrite mode cursor

Browse Source 
Done with mae.
This commit is contained in:
hjk
2010-04-16 13:25:44 +02:00
parent 543826cb12
commit d8be1fbca4
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2681,18 +2681,15 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
bool drawCursorAsBlock = drawCursor && overwriteMode() ; bool drawCursorAsBlock = drawCursor && overwriteMode() ;
if (drawCursorAsBlock) { if (drawCursorAsBlock) {
QTextLayout::FormatRange o;
int relativePos = context.cursorPosition - blpos; int relativePos = context.cursorPosition - blpos;
o.start = relativePos; bool doSelection = true;
o.length = 1;
o.format.setForeground(palette().base());
selections.append(o);
QTextLine line = layout->lineForTextPosition(relativePos); QTextLine line = layout->lineForTextPosition(relativePos);
qreal x = line.cursorToX(relativePos); qreal x = line.cursorToX(relativePos);
qreal w = 0; qreal w = 0;
if (relativePos < line.textLength() - line.textStart()) { if (relativePos < line.textLength() - line.textStart()) {
w = line.cursorToX(relativePos + 1) - x; w = line.cursorToX(relativePos + 1) - x;
if (doc->characterAt(context.cursorPosition) == QLatin1Char('\t')) { if (doc->characterAt(context.cursorPosition) == QLatin1Char('\t')) {
doSelection = false;
int space = QFontMetrics(layout->font()).width(QLatin1Char(' ')); int space = QFontMetrics(layout->font()).width(QLatin1Char(' '));
if (w > space) { if (w > space) {
x += w-space; x += w-space;
@@ -2707,6 +2704,13 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
rr.moveLeft(r.left() + x); rr.moveLeft(r.left() + x);
rr.setWidth(w); rr.setWidth(w);
painter.fillRect(rr, palette().text()); painter.fillRect(rr, palette().text());
if (doSelection) {
QTextLayout::FormatRange o;
o.start = relativePos;
o.length = 1;
o.format.setForeground(palette().base());
selections.append(o);
}
} }