Update so that save input toasts do not show display params for values

that are not filled in
microsoft · Mar 21, 2024 · d4eaec3 · d4eaec3
1 parent 0ad6296
commit d4eaec3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/cascadia/TerminalApp/AppActionHandlers.cpp b/src/cascadia/TerminalApp/AppActionHandlers.cpp
@@ -1255,7 +1255,7 @@ namespace winrt::TerminalApp::implementation
                 try
                 {
                     KeyChord keyChord = nullptr;
-                    hstring keyChordText = L"None";
+                    hstring keyChordText = L"";
                     if (!realArgs.KeyChord().empty())
                     {
                         keyChord = KeyChordSerialization::FromString(winrt::to_hstring(realArgs.KeyChord()));

diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -4245,9 +4245,15 @@ namespace winrt::TerminalApp::implementation
                 }
             }
             _UpdateTeachingTipTheme(ActionSavedToast().try_as<winrt::Windows::UI::Xaml::FrameworkElement>());
-            ActionSavedNameText().Text(L"Name: " + name);
-            ActionSavedKeyChordText().Text(L"Key Chord: " + keyChord);
-            ActionSavedCommandLineText().Text(L"Input: " + input);
+
+            auto setText = [](const TextBlock& textBlock, const winrt::hstring& prefix, const winrt::hstring& text) {
+                textBlock.Text(text.empty() ? L"" : prefix + text);
+                textBlock.Visibility(text.empty() ? Windows::UI::Xaml::Visibility::Collapsed : Windows::UI::Xaml::Visibility::Visible);
+            };
+
+            setText(ActionSavedNameText(), L"Name: ", name);
+            setText(ActionSavedKeyChordText(), L"Key Chord: " ,keyChord );
+            setText(ActionSavedCommandLineText(), L"Input: " , input);
 
             if (page->_actionSavedToast != nullptr)
             {