Merge pull request BalazsJako#36 from pthom/bundle_fixes

Some changes from Dear ImGui Bundle

Author: goossens

TextEditor.cpp

@@ -170,6 +170,7 @@ void TextEditor::render(const char* title, const ImVec2& size, bool border) {
 	ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0f, 0.0f));
 	ImGui::PushStyleColor(ImGuiCol_ChildBg, ImGui::ColorConvertU32ToFloat4(palette.get(Color::background)));
 	ImGui::BeginChild(title, size, border, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_HorizontalScrollbar | ImGuiWindowFlags_NoNavInputs);
+	lastRenderOrigin = ImGui::GetCursorScreenPos();
 
 	// handle keyboard and mouse inputs
 	handleKeyboardInputs();
@@ -1306,6 +1307,30 @@ std::string TextEditor::getCursorText(size_t cursor) const {
 }
 
 
+//
+//	TextEditor::GetWordAtScreenPos
+//
+
+std::string TextEditor::GetWordAtScreenPos(const ImVec2& screenPos) const {
+	// Convert screen position to local coordinates using the origin saved during last Render()
+	auto local = screenPos - lastRenderOrigin;
+
+	// Convert to text coordinates using the same logic as handleMouseInteractions()
+	Coordinate glyphCoordinate;
+	Coordinate cursorCoordinate;
+	document.normalizeCoordinate(
+		local.y / glyphSize.y,
+		(local.x - textOffset) / glyphSize.x,
+		glyphCoordinate,
+		cursorCoordinate);
+
+	// Find word boundaries and extract text
+	auto start = document.findWordStart(glyphCoordinate);
+	auto end = document.findWordEnd(glyphCoordinate);
+	return document.getSectionText(start, end);
+}
+
+
 //
 //	TextEditor::makeCursorVisible
 //
@@ -2355,12 +2380,12 @@ TextEditor::Palette TextEditor::defaultPalette = TextEditor::GetDarkPalette();
 //
 
 TextEditor::Coordinate TextEditor::Cursor::adjustCoordinateForInsert(Coordinate coordinate, Coordinate insertStart, Coordinate insertEnd) {
-	coordinate.line += insertEnd.line - insertStart.line;
-
-	if (end.line == coordinate.line) {
+	if (insertStart.line == coordinate.line) {
 		coordinate.column += insertEnd.column - insertStart.column;
 	}
 
+	coordinate.line += insertEnd.line - insertStart.line;
+
 	return coordinate;
 }
 
@@ -6220,7 +6245,7 @@ bool TextEditor::CodePoint::isWhiteSpace(ImWchar codepoint) {
 
 bool TextEditor::CodePoint::isWord(ImWchar codepoint) {
 	if (codepoint < 0x7f) {
-		return (static_cast<unsigned>((codepoint | 32) - 'a') < 26) || (static_cast<unsigned>(codepoint - '0') < 10);
+		return (static_cast<unsigned>((codepoint | 32) - 'a') < 26) || (static_cast<unsigned>(codepoint - '0') < 10) || codepoint == '_';
 
 #if defined(IMGUI_USE_WCHAR32)
 	} else if (codepoint >= 0x10000) {

TextEditor.h

@@ -148,6 +148,18 @@ class TextEditor {
 	inline void GetMainCursor(int& line, int& column) const { return getCursor(line, column, cursors.getMainIndex()); }
 	inline void GetCurrentCursor(int& line, int& column) const { return getCursor(line, column, cursors.getCurrentIndex()); }
 
+	// Alternative API for cursor and selection position using lightweight out struct (line and column are zero-based)
+	struct CursorPosition { int line = 0; int column = 0; };
+	struct CursorSelection { CursorPosition start; CursorPosition end; };
+	inline CursorPosition GetMainCursorPosition() const { CursorPosition p; getCursor(p.line, p.column, cursors.getMainIndex()); return p; }
+	inline CursorPosition GetCurrentCursorPosition() const { CursorPosition p; getCursor(p.line, p.column, cursors.getCurrentIndex()); return p; }
+	inline CursorPosition GetCursorPosition(size_t cursor) const { CursorPosition p; getCursor(p.line, p.column, cursor); return p; }
+	inline CursorSelection GetCursorSelection(size_t cursor) const { CursorSelection s; getCursor(s.start.line, s.start.column, s.end.line, s.end.column, cursor); return s; }
+	inline CursorSelection GetMainCursorSelection() const { return GetCursorSelection(cursors.getMainIndex()); }
+
+	// get the word at a screen position (e.g. from ImGui::GetMousePos()) - uses the origin saved during the last Render() call
+	std::string GetWordAtScreenPos(const ImVec2& screenPos) const;
+
 	// scrolling support
 	enum class Scroll {
 		alignTop,
@@ -1281,6 +1293,7 @@ class TextEditor {
 	ImFont* font;
 	float fontSize;
 	ImVec2 glyphSize;
+	ImVec2 lastRenderOrigin;
 	float lineNumberLeftOffset;
 	float lineNumberRightOffset;
 	float decorationOffset;