Fix for save input toast text boxes not hiding when blank

microsoft · May 29, 2024 · 4e85136 · 4e85136
1 parent cf56a9a
commit 4e85136
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -4133,9 +4133,9 @@ namespace winrt::TerminalApp::implementation
             }
             _UpdateTeachingTipTheme(ActionSavedToast().try_as<winrt::Windows::UI::Xaml::FrameworkElement>());
 
-            SavedActionName(L"Name: " + name);
-            SavedActionKeyChord(L"Key Chord: " + keyChord);
-            SavedActionCommandLine(L"Input: " + input);
+            SavedActionName(name);
+            SavedActionKeyChord(keyChord);
+            SavedActionCommandLine(input);
 
             if (page->_actionSavedToast != nullptr)
             {

diff --git a/src/cascadia/TerminalApp/TerminalPage.xaml b/src/cascadia/TerminalApp/TerminalPage.xaml
@@ -216,14 +216,20 @@
                 <StackPanel HorizontalAlignment="Stretch"
                             Orientation="Vertical">
                     <TextBlock x:Name="ActionSavedNameText"
-                               Text="{x:Bind SavedActionName, Mode=OneWay}"
-                               Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(SavedActionName), Mode=OneWay}" />
+                            Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(SavedActionName), Mode=OneWay}">
+                        <Run Text="Name: " />
+                        <Run Text="{x:Bind SavedActionName, Mode=OneWay}" />
+                    </TextBlock>
                     <TextBlock x:Name="ActionSavedKeyChordText"
-                               Text="{x:Bind SavedActionKeyChord, Mode=OneWay}"
-                               Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(SavedActionKeyChord), Mode=OneWay}" />
+                            Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(SavedActionKeyChord), Mode=OneWay}">
+                        <Run Text="Key Chord: " />
+                        <Run Text="{x:Bind SavedActionKeyChord, Mode=OneWay}" />
+                    </TextBlock>
                     <TextBlock x:Name="ActionSavedCommandLineText"
-                               Text="{x:Bind SavedActionCommandLine, Mode=OneWay}"
-                               Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(SavedActionCommandLine), Mode=OneWay}" />
+                               Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(SavedActionCommandLine), Mode=OneWay}">
+                        <Run Text="Command Line: " />
+                        <Run Text="{x:Bind SavedActionCommandLine, Mode=OneWay}" />
+                    </TextBlock>
                 </StackPanel>
             </mux:TeachingTip.Content>
         </mux:TeachingTip>