From 721f674b301a38fdb16ed77341a3db625c3f4db7 Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Tue, 8 Dec 2020 12:27:59 -0600
Subject: [PATCH 1/4] replace the dialog with a InfoBar

---
 src/cascadia/TerminalApp/TerminalPage.cpp  | 9 +++++----
 src/cascadia/TerminalApp/TerminalPage.xaml | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index eab3929e15c..73da723eb7c 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -2862,10 +2862,11 @@ namespace winrt::TerminalApp::implementation
     //   Service" is disabled.
     void TerminalPage::ShowKeyboardServiceWarning()
     {
-        if (auto presenter{ _dialogPresenter.get() })
-        {
-            presenter.ShowDialog(FindName(L"KeyboardServiceDisabledDialog").try_as<WUX::Controls::ContentDialog>());
-        }
+        // if (auto presenter{ _dialogPresenter.get() })
+        // {
+        //     presenter.ShowDialog(FindName(L"KeyboardServiceDisabledDialog").try_as<WUX::Controls::ContentDialog>());
+        // }
+        KeyboardWarningInfoBar().IsOpen(true);
     }
 
     // Function Description:
diff --git a/src/cascadia/TerminalApp/TerminalPage.xaml b/src/cascadia/TerminalApp/TerminalPage.xaml
index b3d23949361..8ef46045c3a 100644
--- a/src/cascadia/TerminalApp/TerminalPage.xaml
+++ b/src/cascadia/TerminalApp/TerminalPage.xaml
@@ -110,5 +110,7 @@ the MIT License. See LICENSE in the project root for license information. -->
             Grid.Row="1"
             Visibility="Collapsed"
             VerticalAlignment="Stretch" />
+
+        <mux:InfoBar x:Name="KeyboardWarningInfoBar" IsOpen="False" IsIconVisible="True" IsClosable="True" Severity="Warning" Message="{x:Bind KeyboardServiceDisabledText, Mode=OneWay}"></mux:InfoBar>
     </Grid>
 </Page>

From 6511e455b870ef1325da3cbde752b3975ad58fd1 Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Tue, 8 Dec 2020 12:32:03 -0600
Subject: [PATCH 2/4] Cleanup of the old dialog

---
 src/cascadia/TerminalApp/TerminalPage.cpp  |  8 ++------
 src/cascadia/TerminalApp/TerminalPage.xaml | 21 ++++++---------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index 73da723eb7c..f0307641e27 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -2862,10 +2862,6 @@ namespace winrt::TerminalApp::implementation
     //   Service" is disabled.
     void TerminalPage::ShowKeyboardServiceWarning()
     {
-        // if (auto presenter{ _dialogPresenter.get() })
-        // {
-        //     presenter.ShowDialog(FindName(L"KeyboardServiceDisabledDialog").try_as<WUX::Controls::ContentDialog>());
-        // }
         KeyboardWarningInfoBar().IsOpen(true);
     }
 
@@ -2914,9 +2910,9 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Return the fully-formed warning message for the
-    //   "KeyboardServiceDisabled" dialog. This dialog is used to warn the user
+    //   "KeyboardServiceDisabled" InfoBar. This InfoBar is used to warn the user
     //   if the keyboard service is disabled, and uses the OS localization for
-    //   the service's actual name. It's bound to the dialog in XAML.
+    //   the service's actual name. It's bound to the bar in XAML.
     // Return Value:
     // - The warning message, including the OS-localized service name.
     winrt::hstring TerminalPage::KeyboardServiceDisabledText()
diff --git a/src/cascadia/TerminalApp/TerminalPage.xaml b/src/cascadia/TerminalApp/TerminalPage.xaml
index 8ef46045c3a..57ec8a036b1 100644
--- a/src/cascadia/TerminalApp/TerminalPage.xaml
+++ b/src/cascadia/TerminalApp/TerminalPage.xaml
@@ -91,26 +91,17 @@ the MIT License. See LICENSE in the project root for license information. -->
             </TextBlock>
         </ContentDialog>
 
-
-        <ContentDialog
-            x:Load="False"
-            x:Name="KeyboardServiceDisabledDialog"
-            x:Uid="KeyboardServiceDisabledDialog"
-            DefaultButton="Primary">
-
-            <TextBlock
-                Foreground="{ThemeResource ErrorTextBrush}"
-                IsTextSelectionEnabled="True"
-                TextWrapping="WrapWholeWords"
-                Text="{x:Bind KeyboardServiceDisabledText, Mode=OneWay}" />
-        </ContentDialog>
-
         <local:CommandPalette
             x:Name="CommandPalette"
             Grid.Row="1"
             Visibility="Collapsed"
             VerticalAlignment="Stretch" />
 
-        <mux:InfoBar x:Name="KeyboardWarningInfoBar" IsOpen="False" IsIconVisible="True" IsClosable="True" Severity="Warning" Message="{x:Bind KeyboardServiceDisabledText, Mode=OneWay}"></mux:InfoBar>
+        <mux:InfoBar x:Name="KeyboardWarningInfoBar"
+                     IsClosable="True"
+                     IsIconVisible="True"
+                     IsOpen="False"
+                     Severity="Warning"
+                     Message="{x:Bind KeyboardServiceDisabledText, Mode=OneWay}"/>
     </Grid>
 </Page>

From 7c39ea2aedcfa53c97554b800692dea13d6528e2 Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Tue, 8 Dec 2020 16:19:52 -0600
Subject: [PATCH 3/4] This is handy

---
 src/cascadia/TerminalApp/TerminalPage.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cascadia/TerminalApp/TerminalPage.xaml b/src/cascadia/TerminalApp/TerminalPage.xaml
index 57ec8a036b1..2484ee03a2c 100644
--- a/src/cascadia/TerminalApp/TerminalPage.xaml
+++ b/src/cascadia/TerminalApp/TerminalPage.xaml
@@ -98,6 +98,7 @@ the MIT License. See LICENSE in the project root for license information. -->
             VerticalAlignment="Stretch" />
 
         <mux:InfoBar x:Name="KeyboardWarningInfoBar"
+                     x:Load="False"
                      IsClosable="True"
                      IsIconVisible="True"
                      IsOpen="False"

From f2c14a02821a4ab4f841d5864a0f0793f18b508c Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Fri, 11 Dec 2020 12:00:00 -0600
Subject: [PATCH 4/4] What? I always compile and test my code before
 committing...

---
 src/cascadia/TerminalApp/TerminalPage.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index f0307641e27..3314b008e20 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -2862,7 +2862,10 @@ namespace winrt::TerminalApp::implementation
     //   Service" is disabled.
     void TerminalPage::ShowKeyboardServiceWarning()
     {
-        KeyboardWarningInfoBar().IsOpen(true);
+        if (auto keyboardWarningInfoBar = FindName(L"KeyboardWarningInfoBar").try_as<MUX::Controls::InfoBar>())
+        {
+            keyboardWarningInfoBar.IsOpen(true);
+        }
     }
 
     // Function Description: