Fixed another search window focus issue

Author: goossens

TextEditor.cpp

@@ -4164,8 +4164,14 @@ void TextEditor::renderFindReplace(ImVec2 pos, float width) {
 			}
 		}
 
-		if (ImGui::IsItemDeactivated() && (ImGui::IsKeyPressed(ImGuiKey_Enter) || ImGui::IsKeyPressed(ImGuiKey_KeypadEnter))){
-			focusOnEditor = true;
+		if (ImGui::IsItemDeactivated()) {
+			if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
+				closeFindReplace();
+
+			} else if (ImGui::IsKeyPressed(ImGuiKey_Enter) || ImGui::IsKeyPressed(ImGuiKey_KeypadEnter)) {
+				focusOnEditor = true;
+				focusOnFind = false;
+			}
 		}
 
 		bool disableFindButtons = !findText.size();
@@ -4417,8 +4423,8 @@ void TextEditor::openFindReplace() {
 
 void TextEditor::closeFindReplace() {
 	findReplaceVisible = false;
-	focusOnFind = false;
 	focusOnEditor = true;
+	focusOnFind = false;
 }
 
 
@@ -4430,6 +4436,7 @@ void TextEditor::find() {
 	if (findText.size()) {
 		selectNextOccurrenceOf(findText, caseSensitiveFind, wholeWordFind);
 		focusOnEditor = true;
+		focusOnFind = false;
 	}
 }
 
@@ -4442,6 +4449,7 @@ void TextEditor::findNext() {
 	if (findText.size()) {
 		selectNextOccurrenceOf(findText, caseSensitiveFind, wholeWordFind);
 		focusOnEditor = true;
+		focusOnFind = false;
 	}
 }
 
@@ -4454,6 +4462,7 @@ void TextEditor::findAll() {
 	if (findText.size()) {
 		selectAllOccurrencesOf(findText, caseSensitiveFind, wholeWordFind);
 		focusOnEditor = true;
+		focusOnFind = false;
 	}
 }
 
@@ -4471,6 +4480,7 @@ void TextEditor::replace() {
 		replaceTextInCurrentCursor(replaceText);
 		selectNextOccurrenceOf(findText, caseSensitiveFind, wholeWordFind);
 		focusOnEditor = true;
+		focusOnFind = false;
 	}
 }
 
@@ -4484,6 +4494,7 @@ void TextEditor::replaceAll() {
 		selectAllOccurrencesOf(findText, caseSensitiveFind, wholeWordFind);
 		replaceTextInAllCursors(replaceText);
 		focusOnEditor = true;
+		focusOnFind = false;
 	}
 }