Fix wrong behavior of the revised text widget when moving the cursor …

…one line down while already on the last displayed line of the text. See comment in ticket [1871581951] for details.
tcltk · Sep 13, 2024 · fd1a3b1 · fd1a3b1
1 parent 70f2dd3
commit fd1a3b1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c
@@ -2945,7 +2945,19 @@ ForwBack(
 	    count = abs(count);
 
 	    if (forward) {
+		TkTextIndex indexPtr2 = *indexPtr;
+
+		/*
+		 * Check crossing of the end of text boundary. If crossed, adjust
+		 * xOffset so that the returned index will refer to the end of line.
+		 */
+
+		TkTextFindDisplayIndex(textPtr, &indexPtr2, count - 1, NULL);
 		TkTextFindDisplayIndex(textPtr, indexPtr, count, &xOffset);
+		if (!TkTextIndexCompare(&indexPtr2, indexPtr)) {
+		    TkTextIndexSetupToEndOfText(indexPtr, textPtr, textPtr->sharedTextPtr->tree);
+		    TkTextFindDisplayIndex(textPtr, indexPtr, 0, &xOffset);
+		}
 	    } else {
 		TkTextIndex indexPtr2 = *indexPtr;
 

diff --git a/tests/textMark.test b/tests/textMark.test
@@ -204,7 +204,7 @@ test textMark-6.6 {attempt to move the insert mark beyond peer -endline - bug 34
   set res [.p index insert]
 } -cleanup {
   destroy .p
-} -result {1.2}
+} -result {1.9}
 
 test textMark-7.1 {MarkFindNext - invalid mark name} -body {
     .t mark next bogus