+ fix: view selection on wrapped long-lines vs. normalizing view

+ upd: grepWinNP3 version (v2.1.0.4)

Versions/day.txt

@@ -1 +1 @@
-411
+413

res/Notepad3.exe.manifest.conf

@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.411.1"
+    version="5.20.413.1"
     type="win32"
   />
   <description>Notepad3 NF</description>

src/Edit.c

@@ -4980,7 +4980,8 @@ void EditSetSelectionEx(DocPos iAnchorPos, DocPos iCurrentPos, DocPos vSpcAnchor
     else {
       SciCall_SetSel(iAnchorPos, iCurrentPos);  // scrolls into view
     }
-    EditNormalizeView(Sci_GetCurrentLineNumber()); // normalize view
+    //~EditNormalizeView(Sci_GetCurrentLineNumber()); // normalize view
+    EditEnsureSelectionVisible();
   }
   
   //~~~_END_UNDO_ACTION_;~~~
@@ -6877,7 +6878,8 @@ void EditSelectionMultiSelectAll()
     if (iMainAnchor > iMainCaret) {
       SciCall_SwapMainAnchorCaret();
     }
-    EditNormalizeView(Sci_GetCurrentLineNumber()); // normalize view
+    //~EditNormalizeView(Sci_GetCurrentLineNumber()); // normalize view
+    EditEnsureSelectionVisible();
 
     SciCall_SetTargetRange(saveTargetBeg, saveTargetEnd); //restore
   }

src/Notepad3.c

@@ -4871,7 +4871,8 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
           case IDM_EDIT_SELTONEXT:
           {
             SciCall_RotateSelection();
-            EditNormalizeView(Sci_GetCurrentLineNumber());
+            //~EditNormalizeView(Sci_GetCurrentLineNumber());
+            EditEnsureSelectionVisible();
           }
           break;
 
@@ -4884,7 +4885,8 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
               DocPosU const iNewMain = SciCall_GetSelections() - 1;
               SciCall_SetMainSelection(iNewMain);
             }
-            EditNormalizeView(Sci_GetCurrentLineNumber()); // normalize view
+            //EditNormalizeView(Sci_GetCurrentLineNumber()); // normalize view
+            EditEnsureSelectionVisible();
           }
           break;
 
@@ -9516,7 +9518,8 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
       else if ((iCaretPos >= 0) && (iAnchorPos >= 0))
       {
         SciCall_SetSel(iAnchorPos, iCaretPos); // scroll into view
-        EditNormalizeView(Sci_GetCurrentLineNumber());
+        //~EditNormalizeView(Sci_GetCurrentLineNumber());
+        EditEnsureSelectionVisible();
       }
     }
 

src/VersionEx.h

@@ -8,7 +8,7 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 411
+#define VERSION_REV 413
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 432
 #define ONIGURUMA_REGEX_VER 6.9.5