CHANGELOG.md

@@ -12,15 +12,9 @@ Jump to version:
 
 ## 6.2.0 (In Development)
 
-### MLEM
-Fixes
-- Fixed control characters being included in TextInput
-
 ### MLEM.Ui
 Fixes
 - Fixed images not updating their hidden state properly when the displayed texture changes
-- Fixed control characters being included in TextField
-- Fixed a multiline text field's cursor not returning to the default position when the last character is removed
 
 ## 6.1.0
 

MLEM/Input/TextInput.cs

@@ -415,20 +415,16 @@ namespace MLEM.Input {
         }
 
         private bool FilterText(ref string text, bool removeMismatching) {
+            if (removeMismatching) {
                 var result = new StringBuilder();
                 foreach (var codePoint in new CodePointSource(text)) {
                     var character = char.ConvertFromUtf32(codePoint);
-                // don't include control characters
+                    if (this.InputRule(this, character))
-                if (character.Length == 1 && char.IsControl(character, 0))
-                    continue;
-                if (this.InputRule(this, character)) {
                         result.Append(character);
-                } else if (!removeMismatching) {
-                    // if we don't remove mismatching characters, we just fail
-                    return false;
-                }
                 }
                 text = result.ToString();
+            } else if (!this.InputRule(this, text))
+                return false;
             return true;
         }
 
@@ -512,14 +508,6 @@ namespace MLEM.Input {
 
         private void UpdateCaretData() {
             if (this.splitText != null) {
-                // the code below will never execute if our text is empty, so reset our caret position fully
-                if (this.splitText.Length <= 0) {
-                    this.caretLine = 0;
-                    this.caretPosInLine = 0;
-                    this.caretDrawOffset = 0;
-                    return;
-                }
-
                 var line = 0;
                 var index = 0;
                 for (var d = 0; d < this.splitText.Length; d++) {