From fb81bfdee93899053f8696ead533a32d17318564 Mon Sep 17 00:00:00 2001
From: 2xsaiko
Date: Fri, 2 Oct 2020 15:19:21 +0200
Subject: Focus editor after rename

Closes #318
---
 build.gradle                                               |  2 +-
 .../java/cuchaz/enigma/gui/panels/IdentifierPanel.java     | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index cea13a1d..0beb1840 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ subprojects {
     }
 
     group = 'cuchaz'
-    version = '0.21.2'
+    version = '0.21.3'
 
     def buildNumber = System.getenv("BUILD_NUMBER")
     version = version + "+" + (buildNumber ? "build.$buildNumber" : "local")
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java
index 4c506404..b31d5c35 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java
@@ -142,10 +142,16 @@ public class IdentifierPanel {
 
 				@Override
 				public void onStopEditing(ConvertingTextField field, boolean abort) {
-					if (abort) return;
-					vc.reset();
-					vc.setActiveElement(field);
-					doRename(field.getText());
+					if (!abort) {
+						vc.reset();
+						vc.setActiveElement(field);
+						doRename(field.getText());
+					}
+
+					EditorPanel e = gui.getActiveEditor();
+					if (e != null) {
+						e.getEditor().requestFocusInWindow();
+					}
 				}
 			});
 		}
-- 
cgit v1.2.3