Fix for bug #2871749 where rectangular selection Shift+Alt+Down could not

move through wrapped lines.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/Editor.cxx b/src/Editor.cxx
index 45cf73bec..f4f78de86 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -4561,8 +4561,10 @@ void Editor::NewLine() {
 }
 
 void Editor::CursorUpOrDown(int direction, Selection::selTypes selt) {
-	Point pt = PointMainCaret();
-	int lineDoc = pdoc->LineFromPosition(sel.MainCaret());
+	SelectionPosition caretToUse = sel.IsRectangular() ?
+		sel.Rectangular().caret : sel.Range(sel.Main()).caret;
+	Point pt = LocationFromPosition(caretToUse);
+	int lineDoc = pdoc->LineFromPosition(caretToUse.Position());
 	Point ptStartLine = LocationFromPosition(pdoc->LineStart(lineDoc));
 	int subLine = (pt.y - ptStartLine.y) / vs.lineHeight;
 	int commentLines = vs.annotationVisible ? pdoc->AnnotationLines(lineDoc) : 0;