From f3ee0029c7683ca3aa2149b046cc53387e9eb738 Mon Sep 17 00:00:00 2001
From: RaiKoHoff <rainer.kottenhoff@gmail.com>
Date: Tue, 17 Mar 2020 08:45:28 +0100
Subject: [PATCH] + fix: Focused-View scrolling

---
 Versions/build.txt             | 2 +-
 Versions/day.txt               | 2 +-
 res/Notepad3.exe.manifest.conf | 2 +-
 src/Edit.c                     | 1 +
 src/SciCall.h                  | 2 +-
 src/VersionEx.h                | 6 +++---
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Versions/build.txt b/Versions/build.txt
index 00750edc0..d00491fd7 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-3
+1
diff --git a/Versions/day.txt b/Versions/day.txt
index 47eb669ba..4dab36bb4 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-316
+317
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 88b25ea79..aa82463dd 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.316.3"
+    version="5.20.317.1"
     type="win32"
   />
   <description>Notepad3 RC3</description>
diff --git a/src/Edit.c b/src/Edit.c
index 454c14a1f..b73ce5acf 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -6983,6 +6983,7 @@ void EditToggleView(HWND hwnd)
   }
   else {
     Sci_ScrollToLine(Sci_GetCurrentLineNumber());
+    SciCall_ScrollCaret();
     SciCall_SetReadOnly(false);
   }
 
diff --git a/src/SciCall.h b/src/SciCall.h
index aa6ed96b8..db016d7f7 100644
--- a/src/SciCall.h
+++ b/src/SciCall.h
@@ -599,7 +599,7 @@ inline DocPos Sci_GetRangeMaxLineLength(DocLn iBeginLine, DocLn iEndLine) {
 }
 
 // respect VSlop settings 
-#define Sci_ScrollToLine(L)  SciCall_ScrollRange(SciCall_GetLineEndPosition(L), SciCall_PositionFromLine(L));
+#define Sci_ScrollToLine(L)  SciCall_ScrollRange(SciCall_PositionFromLine(L), SciCall_GetLineEndPosition(L))
 
 #define Sci_ReplaceTarget(M,L,T) (((M) == SCI_REPLACETARGET) ? SciCall_ReplaceTarget((L),(T)) : SciCall_ReplaceTargetRe((L),(T)))
 
diff --git a/src/VersionEx.h b/src/VersionEx.h
index ec4388f04..a03e1b175 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,12 +8,12 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 316
-#define VERSION_BUILD 3
+#define VERSION_REV 317
+#define VERSION_BUILD 1
 #define SCINTILLA_VER 432
 #define ONIGURUMA_REGEX_VER 6.9.4
 #define UCHARDET_VER 2018.09.27
 #define TINYEXPR_VER 2018.05.11
 #define UTHASH_VER 2.1.0
 #define VERSION_PATCH RC3
-#define VERSION_COMMIT_ID dkt1-amr
+#define VERSION_COMMIT_ID t7820-rk