From bd21d7fff6b7f0b5ea430b3fa2bae8b028f1f2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Wed, 21 Feb 2018 22:49:50 +0100
Subject: [PATCH] GUI: Improved scrolling in code display

---
 gui/codeeditor.cpp | 11 +++++------
 gui/codeeditor.h   |  2 +-
 gui/resultsview.ui |  8 +++++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/gui/codeeditor.cpp b/gui/codeeditor.cpp
index bf0959529..ab2ef41ba 100644
--- a/gui/codeeditor.cpp
+++ b/gui/codeeditor.cpp
@@ -144,6 +144,8 @@ void CodeEditor::setError(const QString &code, int errorLine, const QStringList
     tc.setPosition(mErrorPosition);
     setTextCursor(tc);
     centerCursor();
+
+    highlightErrorLine();
 }
 
 int CodeEditor::lineNumberAreaWidth()
@@ -182,12 +184,8 @@ void CodeEditor::resizeEvent(QResizeEvent *event)
     lineNumberArea->setGeometry(QRect(cr.left(), cr.top(), lineNumberAreaWidth(), cr.height()));
 }
 
-void CodeEditor::highlightCurrentLine()
+void CodeEditor::highlightErrorLine()
 {
-    QTextCursor tc = textCursor();
-    tc.setPosition(mErrorPosition);
-    setTextCursor(tc);
-
     QList<QTextEdit::ExtraSelection> extraSelections;
 
     QTextEdit::ExtraSelection selection;
@@ -196,7 +194,8 @@ void CodeEditor::highlightCurrentLine()
 
     selection.format.setBackground(lineColor);
     selection.format.setProperty(QTextFormat::FullWidthSelection, true);
-    selection.cursor = textCursor();
+    selection.cursor = QTextCursor(document());
+    selection.cursor.setPosition(mErrorPosition);
     selection.cursor.clearSelection();
     extraSelections.append(selection);
 
diff --git a/gui/codeeditor.h b/gui/codeeditor.h
index 352bb4b58..00d721de4 100644
--- a/gui/codeeditor.h
+++ b/gui/codeeditor.h
@@ -61,7 +61,7 @@ protected:
 
 private slots:
     void updateLineNumberAreaWidth(int newBlockCount);
-    void highlightCurrentLine();
+    void highlightErrorLine();
     void updateLineNumberArea(const QRect &, int);
 
 private:
diff --git a/gui/resultsview.ui b/gui/resultsview.ui
index fd3a455b0..356cf0de7 100644
--- a/gui/resultsview.ui
+++ b/gui/resultsview.ui
@@ -140,9 +140,15 @@
             <verstretch>4</verstretch>
            </sizepolicy>
           </property>
-          <property name="readOnly">
+          <property name="undoRedoEnabled">
            <bool>false</bool>
           </property>
+          <property name="lineWrapMode">
+           <enum>QPlainTextEdit::NoWrap</enum>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
        </layout>