Commit 0fffad22 authored by mae's avatar mae
Browse files

Merge commit 'origin/1.3'

parents 8a050af5 7fa8574d
......@@ -12334,7 +12334,7 @@ Installiere Anwendung auf &apos;%2&apos;...</translation>
<message>
<location line="-28"/>
<source>No Qt installed</source>
<translation>Qt ist nicht installiert&apos;</translation>
<translation>Qt ist nicht installiert</translation>
</message>
</context>
<context>
......
......@@ -1519,7 +1519,8 @@ BaseTextEditorPrivate::BaseTextEditorPrivate()
m_inBlockSelectionMode(false),
m_lastEventWasBlockSelectionEvent(false),
m_blockSelectionExtraX(0),
m_moveLineUndoHack(false)
m_moveLineUndoHack(false),
m_cursorBlockNumber(-1)
{
}
......@@ -2866,6 +2867,22 @@ void BaseTextEditor::updateCurrentLineHighlight()
}
setExtraSelections(CurrentLineSelection, extraSelections);
// the extra area shows information for the entire current block, not just the currentline.
// This is why we must force a bigger update region.
int cursorBlockNumber = textCursor().blockNumber();
if (cursorBlockNumber != d->m_cursorBlockNumber) {
QPointF offset = contentOffset();
QTextBlock block = document()->findBlockByNumber(d->m_cursorBlockNumber);
if (block.isValid())
d->m_extraArea->update(blockBoundingGeometry(block).translated(offset).toAlignedRect());
block = document()->findBlockByNumber(cursorBlockNumber);
if (block.isValid())
d->m_extraArea->update(blockBoundingGeometry(block).translated(offset).toAlignedRect());
d->m_cursorBlockNumber = cursorBlockNumber;
}
}
void BaseTextEditor::slotCursorPositionChanged()
......
......@@ -253,6 +253,7 @@ public:
QTimer *m_highlightBlocksTimer;
QPointer<BaseTextEditorAnimator> m_animator;
int m_cursorBlockNumber;
};
......
bin/qmake
bin/lrelease
lib/libQtCore.so
%%
lib/libQtCore.la
......
bin/qmake.exe
bin/lrelease.exe
bin/QtCore4.dll
bin/QtCored4.dll
%%
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment