From 5fd4b3aaaf3ad523edc18e7a27e4219a5e48d3ed Mon Sep 17 00:00:00 2001
From: Ian O'Neill <ianjoneill@users.noreply.github.com>
Date: Fri, 3 Sep 2021 19:36:11 +0100
Subject: [PATCH 1/2] Disable autocorrect for command, path and find text
 inputs

---
 src/cascadia/TerminalControl/SearchBoxControl.xaml   | 1 +
 src/cascadia/TerminalSettingsEditor/Appearances.xaml | 1 +
 src/cascadia/TerminalSettingsEditor/Interaction.xaml | 1 +
 src/cascadia/TerminalSettingsEditor/Profiles.xaml    | 3 +++
 4 files changed, 6 insertions(+)

diff --git a/src/cascadia/TerminalControl/SearchBoxControl.xaml b/src/cascadia/TerminalControl/SearchBoxControl.xaml
index f390f07bbf2..908d710ccd8 100644
--- a/src/cascadia/TerminalControl/SearchBoxControl.xaml
+++ b/src/cascadia/TerminalControl/SearchBoxControl.xaml
@@ -240,6 +240,7 @@
                  CornerRadius="2"
                  FontSize="15"
                  KeyDown="TextBoxKeyDown"
+                 IsSpellCheckEnabled="False"
                  PlaceholderForeground="{ThemeResource TextBoxPlaceholderTextThemeBrush}" />
 
         <ToggleButton x:Name="GoBackwardButton"
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
index a2f715fd27e..b7ecd3513b8 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -207,6 +207,7 @@
                     <StackPanel Orientation="Horizontal">
                         <TextBox IsEnabled="{x:Bind local:Converters.StringsAreNotEqual('desktopWallpaper', Appearance.BackgroundImagePath), Mode=OneWay}"
                                  Style="{StaticResource TextBoxSettingStyle}"
+                                 IsSpellCheckEnabled="False"
                                  Text="{x:Bind local:Converters.StringFallBackToEmptyString('desktopWallpaper', Appearance.BackgroundImagePath), Mode=TwoWay, BindBack=Appearance.SetBackgroundImagePath}" />
                         <Button x:Uid="Profile_BackgroundImageBrowse"
                                 Click="BackgroundImage_Click"
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
index 72f8d21c2a2..4f57ed075b1 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -47,6 +47,7 @@
             <!--  Word Delimiters  -->
             <local:SettingContainer x:Uid="Globals_WordDelimiters">
                 <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                         IsSpellCheckEnabled="False"
                          Text="{x:Bind State.Globals.WordDelimiters, Mode=TwoWay}" />
             </local:SettingContainer>
 
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles.xaml b/src/cascadia/TerminalSettingsEditor/Profiles.xaml
index 46e7e87efc7..7f9f719184f 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles.xaml
@@ -82,6 +82,7 @@
                                                 Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
                             <StackPanel Orientation="Horizontal">
                                 <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                                         IsSpellCheckEnabled="False"
                                          Text="{x:Bind State.Profile.Commandline, Mode=TwoWay}" />
                                 <Button x:Uid="Profile_CommandlineBrowse"
                                         Click="Commandline_Click"
@@ -100,6 +101,7 @@
                                 <StackPanel Orientation="Horizontal">
                                     <TextBox IsEnabled="{x:Bind State.Profile.UseCustomStartingDirectory, Mode=OneWay}"
                                              Style="{StaticResource TextBoxSettingStyle}"
+                                             IsSpellCheckEnabled="False"
                                              Text="{x:Bind State.Profile.StartingDirectory, Mode=TwoWay}" />
                                     <Button x:Name="StartingDirectoryBrowse"
                                             x:Uid="Profile_StartingDirectoryBrowse"
@@ -121,6 +123,7 @@
                             <StackPanel Orientation="Horizontal">
                                 <TextBox FontFamily="Segoe UI, Segoe MDL2 Assets"
                                          Style="{StaticResource TextBoxSettingStyle}"
+                                         IsSpellCheckEnabled="False"
                                          Text="{x:Bind State.Profile.Icon, Mode=TwoWay}" />
                                 <Button x:Uid="Profile_IconBrowse"
                                         Click="Icon_Click"

From 8f951d139e16c85c46882c37921a855a6905a556 Mon Sep 17 00:00:00 2001
From: Ian O'Neill <ianjoneill@users.noreply.github.com>
Date: Fri, 3 Sep 2021 19:56:30 +0100
Subject: [PATCH 2/2] Code format

---
 src/cascadia/TerminalControl/SearchBoxControl.xaml   | 2 +-
 src/cascadia/TerminalSettingsEditor/Appearances.xaml | 2 +-
 src/cascadia/TerminalSettingsEditor/Interaction.xaml | 4 ++--
 src/cascadia/TerminalSettingsEditor/Profiles.xaml    | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cascadia/TerminalControl/SearchBoxControl.xaml b/src/cascadia/TerminalControl/SearchBoxControl.xaml
index 908d710ccd8..494b71609aa 100644
--- a/src/cascadia/TerminalControl/SearchBoxControl.xaml
+++ b/src/cascadia/TerminalControl/SearchBoxControl.xaml
@@ -239,8 +239,8 @@
                  VerticalAlignment="Center"
                  CornerRadius="2"
                  FontSize="15"
-                 KeyDown="TextBoxKeyDown"
                  IsSpellCheckEnabled="False"
+                 KeyDown="TextBoxKeyDown"
                  PlaceholderForeground="{ThemeResource TextBoxPlaceholderTextThemeBrush}" />
 
         <ToggleButton x:Name="GoBackwardButton"
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
index b7ecd3513b8..7765d6626cd 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -206,8 +206,8 @@
                 <StackPanel Orientation="Vertical">
                     <StackPanel Orientation="Horizontal">
                         <TextBox IsEnabled="{x:Bind local:Converters.StringsAreNotEqual('desktopWallpaper', Appearance.BackgroundImagePath), Mode=OneWay}"
-                                 Style="{StaticResource TextBoxSettingStyle}"
                                  IsSpellCheckEnabled="False"
+                                 Style="{StaticResource TextBoxSettingStyle}"
                                  Text="{x:Bind local:Converters.StringFallBackToEmptyString('desktopWallpaper', Appearance.BackgroundImagePath), Mode=TwoWay, BindBack=Appearance.SetBackgroundImagePath}" />
                         <Button x:Uid="Profile_BackgroundImageBrowse"
                                 Click="BackgroundImage_Click"
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
index 4f57ed075b1..2b540efa57e 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -46,8 +46,8 @@
 
             <!--  Word Delimiters  -->
             <local:SettingContainer x:Uid="Globals_WordDelimiters">
-                <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                         IsSpellCheckEnabled="False"
+                <TextBox IsSpellCheckEnabled="False"
+                         Style="{StaticResource TextBoxSettingStyle}"
                          Text="{x:Bind State.Globals.WordDelimiters, Mode=TwoWay}" />
             </local:SettingContainer>
 
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles.xaml b/src/cascadia/TerminalSettingsEditor/Profiles.xaml
index 7f9f719184f..5e11e2450f3 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles.xaml
@@ -81,8 +81,8 @@
                                                 SettingOverrideSource="{x:Bind State.Profile.CommandlineOverrideSource, Mode=OneWay}"
                                                 Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
                             <StackPanel Orientation="Horizontal">
-                                <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                                         IsSpellCheckEnabled="False"
+                                <TextBox IsSpellCheckEnabled="False"
+                                         Style="{StaticResource TextBoxSettingStyle}"
                                          Text="{x:Bind State.Profile.Commandline, Mode=TwoWay}" />
                                 <Button x:Uid="Profile_CommandlineBrowse"
                                         Click="Commandline_Click"
@@ -100,8 +100,8 @@
                             <StackPanel Orientation="Vertical">
                                 <StackPanel Orientation="Horizontal">
                                     <TextBox IsEnabled="{x:Bind State.Profile.UseCustomStartingDirectory, Mode=OneWay}"
-                                             Style="{StaticResource TextBoxSettingStyle}"
                                              IsSpellCheckEnabled="False"
+                                             Style="{StaticResource TextBoxSettingStyle}"
                                              Text="{x:Bind State.Profile.StartingDirectory, Mode=TwoWay}" />
                                     <Button x:Name="StartingDirectoryBrowse"
                                             x:Uid="Profile_StartingDirectoryBrowse"
@@ -122,8 +122,8 @@
                                                 SettingOverrideSource="{x:Bind State.Profile.IconOverrideSource, Mode=OneWay}">
                             <StackPanel Orientation="Horizontal">
                                 <TextBox FontFamily="Segoe UI, Segoe MDL2 Assets"
-                                         Style="{StaticResource TextBoxSettingStyle}"
                                          IsSpellCheckEnabled="False"
+                                         Style="{StaticResource TextBoxSettingStyle}"
                                          Text="{x:Bind State.Profile.Icon, Mode=TwoWay}" />
                                 <Button x:Uid="Profile_IconBrowse"
                                         Click="Icon_Click"