Merge branch '1.2' of git@scm.dev.nokia.troll.no:creator/mainline

This commit is contained in:
Roberto Raggi
2009-06-10 08:52:56 +02:00
5 changed files with 14 additions and 55 deletions

View File

@@ -4208,8 +4208,8 @@ void BaseTextEditorEditable::updateCursorPosition()
const QTextCursor cursor = e->textCursor();
const QTextBlock block = cursor.block();
const int line = block.blockNumber() + 1;
const int column = cursor.position() - block.position() + 1;
m_cursorPositionLabel->setText(tr("Line: %1, Col: %2").arg(line).arg(column),
const int column = cursor.position() - block.position();
m_cursorPositionLabel->setText(tr("Line: %1, Col: %2").arg(line).arg(e->tabSettings().columnAt(block.text(), column)+1),
tr("Line: %1, Col: 999").arg(e->blockCount()));
m_contextHelpId.clear();