Added binding for IsEnabled property, set textbox minheight, clear on escape. closes #3438.

Author: retailcoder

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using NLog;
@@ -21,6 +22,7 @@
 using System.Windows;
 
 // ReSharper disable CanBeReplacedWithTryCastAndCheckForNull
+// ReSharper disable ExplicitCallerInfoArgument
 
 namespace Rubberduck.Navigation.CodeExplorer
 {
@@ -99,54 +101,45 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
 
             SetNameSortCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>
             {
-                if ((bool)param == true)
+                if ((bool)param)
                 {
                     SortByName = (bool)param;
                     SortByCodeOrder = !(bool)param;
                 }
-            }, param =>
-            {
-                return SortByName ? false : true;
-            });
+            }, param => !SortByName);
 
             SetCodeOrderSortCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>
             {
-                if ((bool)param == true)
+                if ((bool)param)
                 {
                     SortByCodeOrder = (bool)param;
                     SortByName = !(bool)param;
-                };
-            }, param => 
-            {
-                return SortByCodeOrder ? false : true;
-            });
+                }
+            }, param => !SortByCodeOrder);
         }
 
         private CodeExplorerItemViewModel _selectedItem;
         public CodeExplorerItemViewModel SelectedItem
         {
-            get { return _selectedItem; }
+            get => _selectedItem;
             set
             {
                 _selectedItem = value;
                 OnPropertyChanged();
 
-                // ReSharper disable ExplicitCallerInfoArgument
                 OnPropertyChanged("CanExecuteIndenterCommand");
                 OnPropertyChanged("CanExecuteRenameCommand");
                 OnPropertyChanged("CanExecuteFindAllReferencesCommand");
                 OnPropertyChanged("ExportVisibility");
                 OnPropertyChanged("ExportAllVisibility");
                 OnPropertyChanged("PanelTitle");
                 OnPropertyChanged("Description");
-
-                // ReSharper restore ExplicitCallerInfoArgument
             }
         }
 
         public bool SortByName
         {
-            get { return _windowSettings.CodeExplorer_SortByName; }
+            get => _windowSettings.CodeExplorer_SortByName;
             set
             {
                 if (_windowSettings.CodeExplorer_SortByName == value)
@@ -166,7 +159,7 @@ public bool SortByName
 
         public bool SortByCodeOrder
         {
-            get { return _windowSettings.CodeExplorer_SortByCodeOrder; }
+            get => _windowSettings.CodeExplorer_SortByCodeOrder;
             set
             {
                 if (_windowSettings.CodeExplorer_SortByCodeOrder == value)
@@ -192,7 +185,7 @@ public bool SortByCodeOrder
 
         public bool GroupByType
         {
-            get { return _windowSettings.CodeExplorer_GroupByType; }
+            get => _windowSettings.CodeExplorer_GroupByType;
             set
             {
                 if (_windowSettings.CodeExplorer_GroupByType != value)
@@ -207,10 +200,22 @@ public bool GroupByType
             }
         }
 
+        private bool _canSearch;
+
+        public bool CanSearch
+        {
+            get => _canSearch;
+            set
+            {
+                _canSearch = value;
+                OnPropertyChanged();
+            }
+        }
+
         private bool _isBusy;
         public bool IsBusy
         {
-            get { return _isBusy; }
+            get => _isBusy;
             set
             {
                 _isBusy = value;
@@ -277,15 +282,17 @@ public string Description
         private ObservableCollection<CodeExplorerItemViewModel> _projects;
         public ObservableCollection<CodeExplorerItemViewModel> Projects
         {
-            get { return _projects; }
+            get => _projects;
             set
             {
                 ReorderChildNodes(value);
                 _projects = new ObservableCollection<CodeExplorerItemViewModel>(value.OrderBy(o => o.NameWithSignature));
-                
+                CanSearch = _projects.Any();
+
                 OnPropertyChanged();
                 // Once a Project has been set, show the TreeView
                 OnPropertyChanged("TreeViewVisibility");
+                OnPropertyChanged("CanSearch");
             }
         }
 

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -291,6 +291,7 @@
 
             <Style x:Key="XButtonStyle" TargetType="Button">
                 <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="Content" Value="✕"/>
                 <Setter Property="BorderThickness" Value="0"/>
                 <Setter Property="HorizontalContentAlignment" Value="Center"/>
                 <Setter Property="VerticalContentAlignment" Value="Center"/>
@@ -490,10 +491,32 @@
             </ToolBar>
         </ToolBarTray>
 
-        <TextBox Grid.Row="1" TextChanged="SearchBox_OnTextChanged" VerticalContentAlignment="Center" Name="SearchBox"></TextBox>
-        <Image Grid.Row="1" Source="{StaticResource SearchImage}" HorizontalAlignment="Right" VerticalAlignment="Center" MaxHeight="16" Margin="0,0,1,0" MouseDown="SearchIcon_OnMouseDown" Visibility="{Binding ElementName=SearchBox, Path=Text.Length, Converter={StaticResource StringHasValueToVisibility}}" />
-        <Button Grid.Row="1" Style="{StaticResource XButtonStyle}" HorizontalAlignment="Right" VerticalAlignment="Center" Height="18" Width="18" Margin="0,1,1,0" Visibility="{Binding ElementName=SearchBox, Path=Text.Length, Converter={StaticResource StringHasNoValueToVisibility}}" Click="ButtonBase_OnClick">✕</Button>
+        <Border Grid.Row="1" 
+                BorderBrush="{StaticResource {x:Static SystemColors.ControlBrushKey}}" 
+                BorderThickness="1">
+            <Grid>
+                <TextBox x:Name="SearchBox"
+                         VerticalContentAlignment="Center"
+                         IsEnabled="{Binding CanSearch}"
+                         MinHeight="20"
+                         PreviewKeyDown="SearchBox_OnPreviewKeyDown"
+                         TextChanged="SearchBox_OnTextChanged" />
 
+                <Image Source="{StaticResource SearchImage}" 
+                       HorizontalAlignment="Right" VerticalAlignment="Center" 
+                       MaxHeight="16" Margin="0,0,1,0" 
+                       IsEnabled="{Binding CanSearch}"
+                       Visibility="{Binding ElementName=SearchBox, Path=Text.Length, Converter={StaticResource StringHasValueToVisibility}}"
+                       MouseDown="SearchIcon_OnMouseDown" />
+        
+                <Button Style="{StaticResource XButtonStyle}" 
+                        HorizontalAlignment="Right" VerticalAlignment="Center" 
+                        Height="18" Width="18" Margin="0,1,1,0" 
+                        IsEnabled="{Binding CanSearch}"
+                        Visibility="{Binding ElementName=SearchBox, Path=Text.Length, Converter={StaticResource StringHasNoValueToVisibility}}" 
+                        Click="ButtonBase_OnClick" />
+            </Grid>
+        </Border>
         <controls:EmptyUIRefresh Grid.Row="2" />
 
         <TreeView x:Name="ProjectTree"

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml.cs

@@ -43,9 +43,22 @@ private void SearchIcon_OnMouseDown(object sender, MouseButtonEventArgs e)
         }
 
         private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+        {
+            ClearSearchBox();
+        }
+
+        private void ClearSearchBox()
         {
             SearchBox.Text = string.Empty;
             SearchBox.Focus();
         }
+
+        private void SearchBox_OnPreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                ClearSearchBox();
+            }
+        }
     }
 }