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

Editor: Save and restore position in document on auto save.

Browse Source 
Restores the horizontal and vertical scroll bar values when autosaving.

Task-number: QTCREATORBUG-8590
Change-Id: I7e821118fd427264655bbdd18ba5db9bec35841e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
David Schulz
2013-01-29 13:55:55 +01:00
committed by Jarek Kobus
parent 421ea2afa4
commit 6382ae65b9
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/texteditor/basetextdocument.cpp
View File

@@ -38,15 +38,16 @@
#include "syntaxhighlighter.h" #include "syntaxhighlighter.h"
#include "texteditorconstants.h" #include "texteditorconstants.h"
#include <QStringList>
#include <QFile>
#include <QDir>
#include <QFileInfo>
#include <QTextStream>
#include <QTextCodec>
#include <QFutureInterface>
#include <QSyntaxHighlighter>
#include <QApplication> #include <QApplication>
#include <QDir>
#include <QFile>
#include <QFileInfo>
#include <QFutureInterface>
#include <QScrollBar>
#include <QStringList>
#include <QSyntaxHighlighter>
#include <QTextCodec>
#include <QTextStream>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
@@ -210,9 +211,12 @@ bool BaseTextDocument::save(QString *errorString, const QString &fileName, bool
BaseTextEditorWidget *editorWidget = 0; BaseTextEditorWidget *editorWidget = 0;
int savedPosition = 0; int savedPosition = 0;
int savedAnchor = 0; int savedAnchor = 0;
int savedVScrollBarValue = 0;
int savedHScrollBarValue = 0;
int undos = d->m_document->availableUndoSteps(); int undos = d->m_document->availableUndoSteps();
// When saving the current editor, make sure to maintain the cursor position for undo // When saving the current editor, make sure to maintain the cursor and scroll bar
// positions for undo
Core::IEditor *currentEditor = Core::EditorManager::currentEditor(); Core::IEditor *currentEditor = Core::EditorManager::currentEditor();
if (BaseTextEditor *editable = qobject_cast<BaseTextEditor*>(currentEditor)) { if (BaseTextEditor *editable = qobject_cast<BaseTextEditor*>(currentEditor)) {
if (editable->document() == this) { if (editable->document() == this) {
@@ -220,6 +224,8 @@ bool BaseTextDocument::save(QString *errorString, const QString &fileName, bool
QTextCursor cur = editorWidget->textCursor(); QTextCursor cur = editorWidget->textCursor();
savedPosition = cur.position(); savedPosition = cur.position();
savedAnchor = cur.anchor(); savedAnchor = cur.anchor();
savedVScrollBarValue = editorWidget->verticalScrollBar()->value();
savedHScrollBarValue = editorWidget->horizontalScrollBar()->value();
cursor.setPosition(cur.position()); cursor.setPosition(cur.position());
} }
} }
@@ -254,13 +260,15 @@ bool BaseTextDocument::save(QString *errorString, const QString &fileName, bool
const bool ok = write(fName, saveFormat, d->m_document->toPlainText(), errorString); const bool ok = write(fName, saveFormat, d->m_document->toPlainText(), errorString);
// restore text cursor // restore text cursor and scroll bar positions
if (autoSave && undos < d->m_document->availableUndoSteps()) { if (autoSave && undos < d->m_document->availableUndoSteps()) {
d->m_document->undo(); d->m_document->undo();
if (editorWidget) { if (editorWidget) {
QTextCursor cur = editorWidget->textCursor(); QTextCursor cur = editorWidget->textCursor();
cur.setPosition(savedAnchor); cur.setPosition(savedAnchor);
cur.setPosition(savedPosition, QTextCursor::KeepAnchor); cur.setPosition(savedPosition, QTextCursor::KeepAnchor);
editorWidget->verticalScrollBar()->setValue(savedVScrollBarValue);
editorWidget->horizontalScrollBar()->setValue(savedHScrollBarValue);
editorWidget->setTextCursor(cur); editorWidget->setTextCursor(cur);
} }
} }