Fix textarea bug: clicking right of the end of a line caused the cursor to be in one of the next lines (#3474)

HybridDog · nerzhul · commit a4a377ecad6f · 2017-05-19T07:57:21.000+02:00
diff --git a/src/intlGUIEditBox.cpp b/src/intlGUIEditBox.cpp
@@ -1120,14 +1120,16 @@ s32 intlGUIEditBox::getCursorPos(s32 x, s32 y)
 
 	if (x < CurrentTextRect.UpperLeftCorner.X)
 		x = CurrentTextRect.UpperLeftCorner.X;
+	else if (x > CurrentTextRect.LowerRightCorner.X)
+		x = CurrentTextRect.LowerRightCorner.X;
 
 	s32 idx = font->getCharacterFromPos(Text.c_str(), x - CurrentTextRect.UpperLeftCorner.X);
 
 	// click was on or left of the line
 	if (idx != -1)
 		return idx + startPos;
 
-	// click was off the right edge of the line, go to end.
+	// click was off the right edge of the last line, go to end.
 	return txtLine->size() + startPos;
 }
 
