Fix scrolling to top line (texstudio-org#3626)

octaeder · May 3, 2024 · 9971c78 · 9971c78
1 parent 67b37ea
commit 9971c78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/qcodeedit/lib/qeditor.cpp b/src/qcodeedit/lib/qeditor.cpp
@@ -5815,15 +5815,7 @@ void QEditor::scrollToFirstLine(int l){
 
     const qreal ls = document()->getLineSpacing();
     const qreal ypos = m_doc->y(l-1);
-    const qreal yval = verticalOffset();
-    const int ylen = viewport()->height();
-    const qreal yend = ypos + ylen;
-
-	if ( ypos < yval )
-        verticalScrollBar()->setValue(qFloor(ypos / ls));
-	else if ( yend > (yval + ylen) )
-        verticalScrollBar()->setValue(qFloor(1. + (yend - ylen) / ls));
-
+    verticalScrollBar()->setValue(qRound(ypos / ls));
 }
 
 void QEditor::setCursorSurroundingLines(int s){

diff --git a/src/texstudio.cpp b/src/texstudio.cpp
@@ -3598,8 +3598,8 @@ void Texstudio::restoreSession(const Session &s, bool showProgress, bool warnMis
                     col = 0;
                 }
             }
-            edView->editor->setCursorPosition(line, col);
-            edView->editor->scrollToFirstLine(f.firstLine);
+            edView->editor->setCursorPosition(line, col, false);
+            edView->editor->scrollToFirstLine(f.firstLine+1);
             edView->document->foldLines(f.foldedLines);
             editors->moveToTabGroup(edView, f.editorGroup, -1);
         } else {