fix: switch theme to scroll to the next line.

Change-Id: I6f14ccbc4aea817bc827d5013e520700289fb0ce feat: move to the first line after loadding the file.
linuxdeepin · Aug 29, 2018 · abde4fa · abde4fa
1 parent 992f541
commit abde4fa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/editor/src/editor.cpp b/editor/src/editor.cpp
@@ -180,6 +180,7 @@ void Editor::handleFileLoadFinished(const QString &encode, const QString &conten
 
     // update status.
     textEditor->setModified(false);
+    textEditor->moveFirstLine();
 
     // load highlight.
     textEditor->loadHighlighter();

diff --git a/editor/src/texteditor.cpp b/editor/src/texteditor.cpp
@@ -1300,6 +1300,13 @@ void TextEditor::setFontSize(int size)
     updateLineNumber();
 }
 
+void TextEditor::moveFirstLine()
+{
+    QTextCursor cursor = textCursor();
+    cursor.movePosition(QTextCursor::Start);
+    setTextCursor(cursor);
+}
+
 void TextEditor::updateFont()
 {
     QFont font = document()->defaultFont();
@@ -1875,9 +1882,9 @@ void TextEditor::highlightCurrentLine()
     adjustScrollbarMargins();
 
     // Keep current line at visible area.
-    if (cursorRect().top() + fontMetrics().height() >= rect().height()) {
-        scrollLineUp();
-    }
+    // if (cursorRect().top() + fontMetrics().height() >= rect().height()) {
+    //     scrollLineUp();
+    // }
 }
 
 void TextEditor::updateLineNumber()
@@ -1997,7 +2004,6 @@ void TextEditor::setTheme(const KSyntaxHighlighting::Theme &theme, QString theme
     }
 
     m_highlighter->rehighlight();
-
     lineNumberArea->update();
 
     highlightCurrentLine();

diff --git a/editor/src/texteditor.h b/editor/src/texteditor.h
@@ -103,6 +103,7 @@ class TextEditor : public QPlainTextEdit
 
     void setFontFamily(QString fontName);
     void setFontSize(int fontSize);
+    void moveFirstLine();
     void updateFont();
 
     void replaceAll(QString replaceText, QString withText);
@@ -153,7 +154,7 @@ class TextEditor : public QPlainTextEdit
 
     void toggleComment();
     void toggleBullet();
-    void toggleBulletWithLine(int line, bool addBullet);
+    void toggleBulletWithLine(int tltine, bool addBullet);
 
     int getNextWordPosition(QTextCursor cursor, QTextCursor::MoveMode moveMode);
     int getPrevWordPosition(QTextCursor cursor, QTextCursor::MoveMode moveMode);