Working on PPC color catalog.

1 files changed, 16 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchAutoComplete.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchAutoComplete.cs
index da5b44fa6..fd8f17367 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchAutoComplete.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchAutoComplete.cs
@@ -107,7 +107,7 @@ namespace Tango.Touch.Controls
 
         public TouchAutoComplete()
         {
-            AutoCompleteProvider = new AutoCompleteProvider<Object>((obj, filter) => { return obj.ToString().ToLower().StartsWith(filter.ToLower()); });
+            //AutoCompleteProvider = new AutoCompleteProvider<Object>((obj, filter) => { return obj.ToString().ToLower().StartsWith(filter.ToLower()); });
             ItemSelectedCommand = new RelayCommand(() => OnSelectedItemChanged());
         }
 
@@ -136,6 +136,18 @@ namespace Tango.Touch.Controls
         private void _textBox_LostFocus(object sender, RoutedEventArgs e)
         {
             _popup.IsOpen = false;
+
+            if (EffectiveItemsSource != null && EffectiveItemsSource.Count > 0 && SelectedItem == null)
+            {
+                SelectedItem = EffectiveItemsSource[0];
+
+                var binding = BindingOperations.GetBindingExpressionBase(this, SelectedItemProperty);
+
+                if (binding != null)
+                {
+                    binding.UpdateSource();
+                }
+            }
         }
 
         private void _textBox_GotFocus(object sender, RoutedEventArgs e)
@@ -152,6 +164,9 @@ namespace Tango.Touch.Controls
             {
                 EffectiveItemsSource = AutoCompleteProvider.Filter(ItemsSource, Text);
 
+                SelectedItem = null;
+
+
                 if (EffectiveItemsSource.Count > 0)
                 {
                     _popup.IsOpen = true;