Revert "Use StringComparison.Ordinal for the comparison"

This reverts commit 62211e5.
AvaloniaUI · Jun 6, 2024 · 83ea1a8 · 83ea1a8
1 parent 62211e5
commit 83ea1a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Avalonia.Controls.TreeDataGrid/Selection/TreeDataGridRowSelectionModel.cs b/src/Avalonia.Controls.TreeDataGrid/Selection/TreeDataGridRowSelectionModel.cs
@@ -302,7 +302,7 @@ private bool SearchAndSelectRow(TreeDataGrid treeDataGrid,
             if (valueSelector != null && model != null)
             {
                 var value = valueSelector(model);
-                if (value != null && value.ToUpper().StartsWith(candidatePattern, StringComparison.Ordinal))
+                if (value != null && value.ToUpper().StartsWith(candidatePattern))
                 {
                     UpdateSelection(treeDataGrid, newIndex, true);
                     treeDataGrid.RowsPresenter?.BringIntoView(newIndex);

diff --git a/src/Avalonia.Controls.TreeDataGrid/TreeDataGrid.cs b/src/Avalonia.Controls.TreeDataGrid/TreeDataGrid.cs
@@ -368,6 +368,10 @@ protected override void OnKeyUp(KeyEventArgs e)
         protected override void OnTextInput(TextInputEventArgs e)
         {
             base.OnTextInput(e);
+
+            if (e.Text is { Length: > 0 } && char.IsControl(e.Text[0]))
+                return;
+
             _selection?.OnTextInput(this, e);
         }