improved combobox search

Commands/RvtCommand.cs

@@ -29,7 +29,6 @@ public override bool Equals(object obj)
             {
                 return other.Name == Name;
             }
-
             return false;
         }
 

Helpers/UriHelper.cs

@@ -1,10 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.IO;
-using System.Runtime.InteropServices;
 
 namespace RevitGuide.Helpers
 {

Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("0.0.2.0")]

Settings/ItemSetting.cs

@@ -67,9 +67,6 @@ public ItemSetting(string key = null , string uri = "")
             Key = key;
             Uri = uri;
             _allRvtCommands = new ObservableCollection<RvtCommand>(RvtCommandHelper.AllRvtCommands);
-        }
-
-
-
+        }   
     }
 }

Views/SearchComboBox.cs

@@ -1,54 +1,48 @@
 using RevitGuide.Commands;
 using System;
 using System.ComponentModel;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace RevitGuide.Views
 {
     public class SearchComboBox : ComboBox
     {
-        TextBox editableTextBox;
-
+        TextBox _editableTextBox;
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
+            _editableTextBox = GetTemplateChild("PART_EditableTextBox") as TextBox;
             this.IsTextSearchEnabled = false;
             this.IsEditable = true;
-            editableTextBox = GetTemplateChild("PART_EditableTextBox") as TextBox;
-            if (editableTextBox != null)
+
+            if (_editableTextBox != null)
             {
-                editableTextBox.TextChanged += EditableTextBox_TextChanged;
-                editableTextBox.PreviewTextInput += EditableTextBox_PreviewTextInput;
+                _editableTextBox.TextChanged += EditableTextBox_TextChanged;
+                _editableTextBox.GotFocus += EditableTextBox_GotFocus;
             }
         }
 
-        private void EditableTextBox_PreviewTextInput(object sender, TextCompositionEventArgs e)
+        private void EditableTextBox_GotFocus(object sender, RoutedEventArgs e)
         {
-            e.Handled = true;
-            if (editableTextBox.SelectionLength == editableTextBox.Text.Length)
-            {
-                editableTextBox.Text = e.Text;
-            }
-            else
-            {
-                editableTextBox.Text += e.Text;
-            }
-            editableTextBox.CaretIndex = editableTextBox.Text.Length;
+            string text = _editableTextBox.Text;
+            this.SelectedIndex = -1;
+            _editableTextBox.Text = text;
             IsDropDownOpen = true;
         }
 
         private void EditableTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             if (ItemsSource is ICollectionView ICV)
             {
-                if (string.IsNullOrEmpty(editableTextBox.Text.Trim()))
+                if (string.IsNullOrEmpty(_editableTextBox.Text.Trim()))
                 {
                     ICV.Filter = null;
                 }
                 else
                 {
-                    ICV.Filter = new Predicate<object>(i => ((RvtCommand)i).Name.ToLower().Contains(editableTextBox.Text.ToLower()));
+                    ICV.Filter = new Predicate<object>(i => ((RvtCommand)i).Name.ToLower().Contains(_editableTextBox.Text.ToLower()));
                 }
             }
         }

Views/SettingsWindow.xaml

@@ -100,7 +100,9 @@
                         <DataGrid x:Name="TriggerSettingsDataGrid"
                                     ItemsSource="{Binding TriggerSettings,Mode=TwoWay}"
                                     RowHeight="25"
-                                    MouseLeftButtonDown="DataGridMouseLeftButtonUp">
+                                    MouseLeftButtonDown="DataGridMouseLeftButtonUp"
+                                    EnableRowVirtualization="False"
+                                    EnableColumnVirtualization="False">
                             <DataGrid.Columns>
                                 <DataGridTemplateColumn Header="COMMAND" 
                                                         Width="150">

Views/SettingsWindow.xaml.cs

@@ -2,15 +2,13 @@
 using RevitGuide.Settings;
 using RevitGuide.ViewModels;
 using System.Collections.Generic;
-using System.Security.Policy;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 
 namespace RevitGuide.Views
 {
-
     public partial class SettingsWindow : Window
     {
         private SettingsViewModel _settingsViewModel;
@@ -63,6 +61,7 @@ private void DataGridMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
             {
                 _activeDataGrid.CommitEdit(DataGridEditingUnit.Row, true);
                 _activeDataGrid.SelectedItem = null;
+                Keyboard.ClearFocus();
             }
         }