Skip to content

Commit d4eaec3

Browse files
committed
Update so that save input toasts do not show display params for values
that are not filled in
1 parent 0ad6296 commit d4eaec3

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/cascadia/TerminalApp/AppActionHandlers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,7 @@ namespace winrt::TerminalApp::implementation
12551255
try
12561256
{
12571257
KeyChord keyChord = nullptr;
1258-
hstring keyChordText = L"None";
1258+
hstring keyChordText = L"";
12591259
if (!realArgs.KeyChord().empty())
12601260
{
12611261
keyChord = KeyChordSerialization::FromString(winrt::to_hstring(realArgs.KeyChord()));

src/cascadia/TerminalApp/TerminalPage.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4245,9 +4245,15 @@ namespace winrt::TerminalApp::implementation
42454245
}
42464246
}
42474247
_UpdateTeachingTipTheme(ActionSavedToast().try_as<winrt::Windows::UI::Xaml::FrameworkElement>());
4248-
ActionSavedNameText().Text(L"Name: " + name);
4249-
ActionSavedKeyChordText().Text(L"Key Chord: " + keyChord);
4250-
ActionSavedCommandLineText().Text(L"Input: " + input);
4248+
4249+
auto setText = [](const TextBlock& textBlock, const winrt::hstring& prefix, const winrt::hstring& text) {
4250+
textBlock.Text(text.empty() ? L"" : prefix + text);
4251+
textBlock.Visibility(text.empty() ? Windows::UI::Xaml::Visibility::Collapsed : Windows::UI::Xaml::Visibility::Visible);
4252+
};
4253+
4254+
setText(ActionSavedNameText(), L"Name: ", name);
4255+
setText(ActionSavedKeyChordText(), L"Key Chord: " ,keyChord );
4256+
setText(ActionSavedCommandLineText(), L"Input: " , input);
42514257

42524258
if (page->_actionSavedToast != nullptr)
42534259
{

0 commit comments

Comments
 (0)