From c6f856d8cf99b243d2d97a3af968b66cb7d882bc Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Fri, 29 May 2020 00:23:18 -0700
Subject: [PATCH 1/4] Fix Issue with WinUI disrupting padding of
 TokenizingTextBox

Need to understand how to default icon size to the proper size in style, not sure if possible, may need to copy somehow instead?
---
 .../SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind  | 4 ++--
 .../TokenizingTextBoxItem.AutoSuggestBox.xaml                 | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind
index 54ccba3b621..fa0fb4b9d3f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind
@@ -16,7 +16,7 @@
       <controls:TokenizingTextBox
           x:Name="TokenBox"
           PlaceholderText="Add Actions"
-          QueryIcon="{ex:SymbolIconSource Glyph=Setting}"
+          QueryIcon="{ex:SymbolIconSource Glyph=Setting, FontSize=16}"
           MaxHeight="104"
           HorizontalAlignment="Stretch"
           TextMemberPath="Text"
@@ -52,7 +52,7 @@
             PlaceholderText="Select Names"
             MaxHeight="104"
             HorizontalAlignment="Stretch"
-            QueryIcon="{ex:SymbolIconSource Glyph=Find}"
+            QueryIcon="{ex:SymbolIconSource Glyph=Find, FontSize=16}"
             TextMemberPath="Text"
             TokenDelimiter=","
             IsItemClickEnabled="True">
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
index 59cc9eec752..95651105749 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
@@ -2,6 +2,9 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
+    <!--<Thickness x:Key="ButtonPadding">8,4,8,5</Thickness> Not sure if we'll also need this later-->
+    <Thickness x:Key="TextControlThemePadding">10,3,6,6</Thickness><!-- Need local copy of this, as including WinUI overrides this to something that adds too much padding for our inner box -->
+    
     <!--#region Button Styles -->
     <Style x:Key="TokenizingTextBoxDeleteButtonStyle"
            TargetType="Button">

From 54c81e1e2caf53656b2fa722e84f460208502e74 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Fri, 29 May 2020 00:25:25 -0700
Subject: [PATCH 2/4] Update Focus Visual to adapt to platform values if WinUI
 being used

---
 .../TokenizingTextBox/TokenizingTextBox.xaml           | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
index e58a7ee6635..2f1cc223549 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
@@ -8,10 +8,10 @@
     </ResourceDictionary.MergedDictionaries>
 
     <!--  Resources for TokenizingTextBox  -->
-    <Thickness x:Key="TokenizingTextBoxBorderThickness">2</Thickness>
     <Thickness x:Key="TokenizingTextBoxPadding">4</Thickness>
     <Thickness x:Key="TokenizingTextBoxPresenterMargin">0,0,6,0</Thickness>
     <x:Double x:Key="TokenizingTextBoxTokenSpacing">2</x:Double>
+    <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
 
     <controls:TokenizingTextBoxStyleSelector x:Key="TokenizingTextBoxStyleSelector"
                                              TextStyle="{StaticResource TokenizingTextBoxItemTextStyle}"
@@ -23,7 +23,7 @@
         <Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
         <Setter Property="Background" Value="{ThemeResource TextControlBackground}" />
         <Setter Property="BorderBrush" Value="{ThemeResource TextControlBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource TokenizingTextBoxBorderThickness}" />
+        <Setter Property="BorderThickness" Value="{StaticResource TextControlBorderThemeThickness}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="TabNavigation" Value="Once" />
         <Setter Property="IsSwipeEnabled" Value="False" />
@@ -135,6 +135,12 @@
 
                 <VisualStateGroup x:Name="FocusStates">
                     <VisualState x:Name="Focused">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="BorderThickness">
+                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBorderThemeThicknessFocused}" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                        
                         <VisualState.Setters>
                             <Setter Target="FocusVisual.Opacity" Value="1" />
                         </VisualState.Setters>

From 0b9e8e51dab94584c448dd1916bc09704cde51d0 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Fri, 29 May 2020 08:57:59 -0700
Subject: [PATCH 3/4] Fix Style warning

---
 Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs
index 9acbc3915ca..30ef5bc7b5b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs
@@ -178,7 +178,7 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
             {
                 // ignore
             }
-            
+
             deferral.Complete();
         }
     }

From fcd7a9b841db1a98d7ebcf97ee84e632d4e11ea1 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Fri, 29 May 2020 14:44:34 -0700
Subject: [PATCH 4/4] Update
 Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml

Co-authored-by: Sergio Pedri <sergio0694@live.com>
---
 .../TokenizingTextBox/TokenizingTextBox.xaml              | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
index 2f1cc223549..ab583789a1a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
@@ -135,13 +135,8 @@
 
                 <VisualStateGroup x:Name="FocusStates">
                     <VisualState x:Name="Focused">
-                        <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="BorderThickness">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBorderThemeThicknessFocused}" />
-                            </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                        
                         <VisualState.Setters>
+                            <Setter Target="FocusVisual.BorderThickness" Value="{ThemeResource TextControlBorderThemeThicknessFocused}" />
                             <Setter Target="FocusVisual.Opacity" Value="1" />
                         </VisualState.Setters>
                     </VisualState>
@@ -151,4 +146,3 @@
         </Grid>
     </ControlTemplate>
 </ResourceDictionary>
-