Merge remote-tracking branch 'upstream/master'

JoyfulShush · JoyfulShush · commit 58b4ff7dc510 · 2025-10-18T14:56:08.000+03:00
diff --git a/src/TSMapEditor/UI/IME/IMEHandler.cs b/src/TSMapEditor/UI/IME/IMEHandler.cs
@@ -78,8 +78,16 @@ protected virtual void OnIMETextInput(char character)
 
         if (IMEFocus != null)
         {
-            TextBoxHandleChatInputCallbacks.TryGetValue(IMEFocus, out var handleChatInput);
-            handleChatInput?.Invoke(character);
+            // Handle ESC
+            if (character == 27 && CompositionEmpty)
+            {
+                IMEFocus.Text = string.Empty;
+            }
+            else
+            {
+                TextBoxHandleChatInputCallbacks.TryGetValue(IMEFocus, out var handleChatInput);
+                handleChatInput?.Invoke(character);
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,16 @@ protected virtual void OnIMETextInput(char character)`
`78`	`78`
`79`	`79`	`if (IMEFocus != null)`
`80`	`80`	`{`
`81`		`- TextBoxHandleChatInputCallbacks.TryGetValue(IMEFocus, out var handleChatInput);`
`82`		`- handleChatInput?.Invoke(character);`
	`81`	`+ // Handle ESC`
	`82`	`+ if (character == 27 && CompositionEmpty)`
	`83`	`+ {`
	`84`	`+ IMEFocus.Text = string.Empty;`
	`85`	`+ }`
	`86`	`+ else`
	`87`	`+ {`
	`88`	`+ TextBoxHandleChatInputCallbacks.TryGetValue(IMEFocus, out var handleChatInput);`
	`89`	`+ handleChatInput?.Invoke(character);`
	`90`	`+ }`
`83`	`91`	`}`
`84`	`92`	`}`
`85`	`93`