Merge branch 'master' of tig:PowerShell/GraphicalTools

Author: tig

src/Microsoft.PowerShell.ConsoleGuiTools/ConsoleGui.cs

@@ -169,32 +169,34 @@ private void AddFilter(Window win)
                 X = 2
             };
 
-            var filterLabelWidth = filterLabel.Text.Length + 1;
             var filterField = new TextField(string.Empty)
             {
                 X = Pos.Right(filterLabel) + 1,
                 Y = Pos.Top(filterLabel),
                 CanFocus = true,
-                Width = Dim.Fill() - filterLabelWidth
+                Width = Dim.Fill() - filterLabel.Text.Length
             };
 
             var filterErrorLabel = new Label(string.Empty)
             {
                 X = Pos.Right(filterLabel) + 1,
                 Y = Pos.Top(filterLabel) + 1,
                 ColorScheme = Colors.Base,
-                Width = Dim.Fill() - filterLabelWidth
+                Width = Dim.Fill() - filterLabel.Text.Length
             };
 
-            EventHandler<ustring> filterChanged = (object sender, ustring e) =>
+            filterField.Changed += (object sender, ustring e) =>
             {
+                // NOTE: `ustring e` seems to contain the text _before_ the added character...
+                // so we convert the `sender` into a TextField and grab the text from that.
+                string filterText = (sender as TextField)?.Text?.ToString();
                 try
                 {
                     filterErrorLabel.Text = " ";
                     filterErrorLabel.ColorScheme = Colors.Base;
                     filterErrorLabel.Redraw(filterErrorLabel.Bounds);
 
-                    var itemList = GridViewHelpers.FilterData(_itemSource.GridViewRowList, e.ToString());
+                    List<GridViewRow> itemList = GridViewHelpers.FilterData(_itemSource.GridViewRowList, filterText);
                     _listView.Source = new GridViewDataSource(itemList);
                 }
                 catch (Exception ex)
@@ -206,8 +208,6 @@ private void AddFilter(Window win)
                 }
             };
 
-            filterField.Changed += filterChanged;
-
             win.Add(filterLabel, filterField, filterErrorLabel);
         }