Mouse click: can place cursor just after last column

Author: pthom

TextEditor.cpp

@@ -348,28 +348,32 @@ TextEditor::Coordinates TextEditor::ScreenPosToCoordinates(const ImVec2& aPositi
 		int delta = 0;
 
 		// First we find the hovered column coord.
-		while (mTextStart + columnX - (aInsertionMode ? 0.5f : 0.0f) * columnWidth < local.x && (size_t)columnIndex < line.size())
+		while (mTextStart + columnX - (aInsertionMode ? 0.5f : 0.0f) * columnWidth < local.x && (size_t)columnIndex <= line.size())
 		{
 			columnCoord += delta;
-			if (line[columnIndex].mChar == '\t')
-			{
-				float oldX = columnX;
-				columnX = (1.0f + std::floor((1.0f + columnX) / (float(mTabSize) * spaceSize))) * (float(mTabSize) * spaceSize);
-				columnWidth = columnX - oldX;
-				delta = columnCoord - (columnCoord / mTabSize) * mTabSize + mTabSize;
-			}
-			else
-			{
-				char buf[7];
-				auto d = UTF8CharLength(line[columnIndex].mChar);
-				int i = 0;
-				while (i < 6 && d-- > 0)
-					buf[i++] = line[columnIndex].mChar;
-				buf[i] = '\0';
-				columnWidth = ImGui::GetFont()->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, -1.0f, buf).x;
-				columnX += columnWidth;
-				delta = 1;
-			}
+            bool isPastLastLineCharacter = columnIndex >= line.size();
+            if (!isPastLastLineCharacter)
+            {
+                if (line[columnIndex].mChar == '\t')
+                {
+                    float oldX = columnX;
+                    columnX = (1.0f + std::floor((1.0f + columnX) / (float(mTabSize) * spaceSize))) * (float(mTabSize) * spaceSize);
+                    columnWidth = columnX - oldX;
+                    delta = columnCoord - (columnCoord / mTabSize) * mTabSize + mTabSize;
+                }
+                else
+                {
+                    char buf[7];
+                    auto d = UTF8CharLength(line[columnIndex].mChar);
+                    int i = 0;
+                    while (i < 6 && d-- > 0)
+                        buf[i++] = line[columnIndex].mChar;
+                    buf[i] = '\0';
+                    columnWidth = ImGui::GetFont()->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, -1.0f, buf).x;
+                    columnX += columnWidth;
+                    delta = 1;
+                }
+            }
 			++columnIndex;
 		}