holy fuck this is better than I imagined a week ago

Author: zadjii-msft

src/cascadia/TerminalApp/TasksPaneContent.cpp

@@ -44,21 +44,31 @@ namespace winrt::TerminalApp::implementation
         //
         // huh. now that's a thought.
 
-        const auto tasks = _settings.GlobalSettings().ActionMap().FilterToSendInput(L""); // IVector<Model::Command>
-        auto itemSource = winrt::single_threaded_observable_vector<TerminalApp::FilteredTask>();
-        for (const auto& t : tasks)
+        // const auto tasks = _settings.GlobalSettings().ActionMap().FilterToSendInput(L""); // IVector<Model::Command>
+        // auto itemSource = winrt::single_threaded_observable_vector<TerminalApp::FilteredTask>();
+        for (const auto& t : _allTasks)
         {
-            const auto& filtered{ winrt::make<FilteredTask>(t) };
-            filtered.UpdateFilter(queryString);
-            itemSource.Append(filtered);
+            // const auto& filtered{ winrt::make<FilteredTask>(t) };
+            t.UpdateFilter(queryString);
+            // itemSource.Append(filtered);
         }
 
-        _treeView().ItemsSource(itemSource);
+        // _treeView().ItemsSource(itemSource);
     }
 
     void TasksPaneContent::UpdateSettings(const CascadiaSettings& settings)
     {
         _settings = settings;
+
+        const auto tasks = _settings.GlobalSettings().ActionMap().FilterToSendInput(L""); // IVector<Model::Command>
+        _allTasks = winrt::single_threaded_observable_vector<TerminalApp::FilteredTask>();
+        for (const auto& t : tasks)
+        {
+            const auto& filtered{ winrt::make<FilteredTask>(t) };
+            _allTasks.Append(filtered);
+        }
+        _treeView().ItemsSource(_allTasks);
+
         _updateFilteredCommands();
     }
 

src/cascadia/TerminalApp/TasksPaneContent.h

@@ -48,9 +48,10 @@ namespace winrt::TerminalApp::implementation
         friend struct TasksPaneContentT<TasksPaneContent>; // for Xaml to bind events
 
         winrt::weak_ref<Microsoft::Terminal::Control::TermControl> _control{ nullptr };
-        // std::vector<winrt::TerminalApp::TaskViewModel> _allCommands{};
         winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };
 
+        winrt::Windows::Foundation::Collections::IObservableVector<TerminalApp::FilteredTask> _allTasks{ nullptr };
+
         void _runCommandButtonClicked(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs&);
         void _filterTextChanged(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& args);
 
@@ -124,6 +125,8 @@ namespace winrt::TerminalApp::implementation
             {
                 c.UpdateFilter(filter);
             }
+
+            _PropertyChangedHandlers(*this, Windows::UI::Xaml::Data::PropertyChangedEventArgs{ L"Visibility" });
         }
 
         // static int Compare(const winrt::TerminalApp::FilteredCommand& first, const winrt::TerminalApp::FilteredCommand& second);
@@ -152,13 +155,22 @@ namespace winrt::TerminalApp::implementation
 
         winrt::Windows::UI::Xaml::Visibility Visibility()
         {
-            return (_Filter.empty() || _Weight > 0) ? winrt::Windows::UI::Xaml::Visibility::Visible : winrt::Windows::UI::Xaml::Visibility::Collapsed;
+            if (_Filter.empty() || _Weight > 0)
+            {
+                return winrt::Windows::UI::Xaml::Visibility::Visible;
+            }
+            auto totalWeight = _Weight;
+            for (const auto& c : _children)
+            {
+                totalWeight += c.Weight();
+            }
+
+            return totalWeight > 0 ? winrt::Windows::UI::Xaml::Visibility::Visible : winrt::Windows::UI::Xaml::Visibility::Collapsed;
         };
 
     private:
         winrt::Microsoft::Terminal::Settings::Model::Command _command{ nullptr };
         winrt::Windows::Foundation::Collections::IObservableVector<TerminalApp::FilteredTask> _children{ nullptr };
-
     };
 }
 

src/cascadia/TerminalApp/TasksPaneContent.xaml

@@ -34,7 +34,7 @@
                           x:DataType="local:FilteredTask">
                 <mux:TreeViewItem x:Name="rootItem"
                                   ItemsSource="{x:Bind Children}"
-                                  Visibility="{x:Bind Visibility}">
+                                  Visibility="{x:Bind Visibility, Mode=OneWay}">
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="*" />