commit 669d023ffcaa2b13ed9b64272028006d35e86560
author BalazsJako <this.is.balazs.jako@gmail.com> Tue Nov 06 08:10:18 2018 +0000
committer GitHub <noreply@github.com> Tue Nov 06 08:10:18 2018 +0000
tree 6c45dfe37130f720c516307b3e0b304915b96c7b
parent 12948d1ebbac06288989ab202c251cf559be8562
parent 7e695d5320e06f8e8e092041904725f8e87f36a1

Merge pull request #49 from marcel303/fixedKeyMappings

Use GetKeyIndex for Z, Y, C, V and X keys..

TextEditor.cpp

diff --git a/TextEditor.cpp b/TextEditor.cpp
index 5da422c..73b12b7 100644
--- a/TextEditor.cpp
+++ b/TextEditor.cpp
@@ -465,11 +465,11 @@
 		io.WantCaptureKeyboard = true;

 		io.WantTextInput = true;

 

-		if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed('Z'))

+		if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Z)))

 			Undo();

 		else if (!IsReadOnly() && !ctrl && !shift && alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Backspace)))

 			Undo();

-		else if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed('Y'))

+		else if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Y)))

 			Redo();

 		else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_UpArrow)))

 			MoveUp(1, shift);

@@ -495,17 +495,17 @@
 			Delete();

 		else if (!IsReadOnly() && !ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Backspace)))

 			BackSpace();

-		else if (!ctrl && !shift && !alt && ImGui::IsKeyPressed(45))

+		else if (!ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Insert)))

 			mOverwrite ^= true;

-		else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(45))

+		else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Insert)))

 			Copy();

-		else if (ctrl && !shift && !alt && ImGui::IsKeyPressed('C'))

+		else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_C)))

 			Copy();

-		else if (!IsReadOnly() && !ctrl && shift && !alt && ImGui::IsKeyPressed(45))

+		else if (!IsReadOnly() && !ctrl && shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Insert)))

 			Paste();

-		else if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed('V'))

+		else if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_V)))

 			Paste();

-		else if (ctrl && !shift && !alt && ImGui::IsKeyPressed('X'))

+		else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_X)))

 			Cut();

 		else if (!ctrl && shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete)))

 			Cut();