Merge pull request #3087 from livecodesebastien/bugfix-16221

runrevmark · runrevmark · commit 9732632d9f98 · 2015-11-06T11:01:29.000Z
[[ Bug 16221 ]] Fix word-selection in field, when mouse moves backwards
diff --git a/docs/notes/bugfix-16221.md b/docs/notes/bugfix-16221.md
@@ -0,0 +1 @@
+# Hiliting lines in a field are not accurate or working correctly with word selection
diff --git a/engine/src/paragraf.cpp b/engine/src/paragraf.cpp
@@ -2486,8 +2486,18 @@ int2 MCParagraph::setfocus(int4 x, int4 y, uint2 fixedheight,
 					// It then rounds focusedindex down to the beginning of the
 					// previous word.
 					bptr = indextoblock(originalindex, False);
-					originalindex = findwordbreakafter(bptr, originalindex);
-					if (originalindex < textsize && !bptr -> textisspace(&text[originalindex]))
+                    
+                    // SN-2015-10-20: [[ Bug 16221 ]] findwordbreakafter returns
+                    // the index before the last char of the word, so we need to
+                    // advance the index returned, but *only* if originalindex
+                    // is not already the last char of the word, otherwise we
+                    // get the next word boundary.
+                    uint2 t_old_index;
+                    t_old_index = originalindex;
+                    originalindex = findwordbreakafter(bptr, originalindex);
+
+					if (originalindex != t_old_index && originalindex < textsize
+                            && !bptr -> textisspace(&text[t_old_index]))
 					{
 						originalindex = findwordbreakafter(bptr, originalindex);
 						bptr = indextoblock(originalindex, False);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Hiliting lines in a field are not accurate or working correctly with word selection`