commit 0a0fab1cdb946cd34a50f6ae1fa4f5e43505fa09
author BalazsJako <this.is.balazs.jako@gmail.com> Mon Jun 24 14:41:27 2019 +0200
committer GitHub <noreply@github.com> Mon Jun 24 14:41:27 2019 +0200
tree b39b48439babccff3e42ff0cc3f49c4462a9ef93
parent 780852d7ec91a3c704319327f5ba0d1f1d1e66b6
parent 89ca966db30ea7ccf4431f73459cfc75f844565e

Merge pull request #91 from Melix19/remove_horizontal_scrollbar

Remove AlwaysHorizontalScrollbar flag to BeginChild

TextEditor.cpp

diff --git a/TextEditor.cpp b/TextEditor.cpp
index 9153bc1..8901f07 100644
--- a/TextEditor.cpp
+++ b/TextEditor.cpp
@@ -104,7 +104,9 @@
 		{
 			istart = 0;
 			++lstart;
-			result += '\n';
+
+			if (lstart < lend)
+				result += '\n';
 		}
 	}
 
@@ -716,6 +718,8 @@
 			Undo();
 		else if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Y)))
 			Redo();
+		else if (!IsReadOnly() && ctrl && shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Z)))
+			Redo();
 		else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_UpArrow)))
 			MoveUp(1, shift);
 		else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_DownArrow)))
@@ -1870,7 +1874,11 @@
 
 			u.mRemovedStart = u.mRemovedEnd = GetActualCursorCoordinates();
 			--u.mRemovedStart.mColumn;
-			--mState.mCursorPosition.mColumn;
+
+			if (line[cindex].mChar == '\t')
+				mState.mCursorPosition.mColumn -= mTabSize;
+			else
+				--mState.mCursorPosition.mColumn;
 
 			while (cindex < line.size() && cend-- > cindex)
 			{