BUG: [ 1795680 ] MergeEditView: PgUp key behaves odd near beginning of file

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index ffda04d..0f75aa4 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -7,6 +7,7 @@ WinMerge 2.7.5.3
   Add Portuguese translation (#1756364)\r
   BugFix: Fix MakeResDll crash (#1795421)\r
   BugFix: Full screen mode didn't work with multiple monitors (#1788168)\r
+  BugFix: PgUp key didn't do anything in beginning of the file (#1795680)\r
   Translation updates:\r
   - Japanese (r4546)\r
 \r

diff --git a/Src/editlib/ccrystaltextview2.cpp b/Src/editlib/ccrystaltextview2.cpp
index 3535c4b..660556f 100644 (file)
--- a/Src/editlib/ccrystaltextview2.cpp
+++ b/Src/editlib/ccrystaltextview2.cpp
@@ -377,10 +377,10 @@ MovePgUp (BOOL bSelect)
       int nDummy;
       int nNewTopLine;
       GetLineBySubLine(nNewTopSubLine, nNewTopLine, nDummy);
-      m_ptCursorPos.y = nNewTopLine;
       ScrollToSubLine(nNewTopSubLine);
       UpdateSiblingScrollPos(FALSE);
     }
+  m_ptCursorPos.y = m_nTopSubLine;
 
   // setting cursor
   CPoint subLinePos;