Skip to content

Commit 54c81e1

Browse files
Update Focus Visual to adapt to platform values if WinUI being used
1 parent c6f856d commit 54c81e1

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
</ResourceDictionary.MergedDictionaries>
99

1010
<!-- Resources for TokenizingTextBox -->
11-
<Thickness x:Key="TokenizingTextBoxBorderThickness">2</Thickness>
1211
<Thickness x:Key="TokenizingTextBoxPadding">4</Thickness>
1312
<Thickness x:Key="TokenizingTextBoxPresenterMargin">0,0,6,0</Thickness>
1413
<x:Double x:Key="TokenizingTextBoxTokenSpacing">2</x:Double>
14+
<Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
1515

1616
<controls:TokenizingTextBoxStyleSelector x:Key="TokenizingTextBoxStyleSelector"
1717
TextStyle="{StaticResource TokenizingTextBoxItemTextStyle}"
@@ -23,7 +23,7 @@
2323
<Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
2424
<Setter Property="Background" Value="{ThemeResource TextControlBackground}" />
2525
<Setter Property="BorderBrush" Value="{ThemeResource TextControlBorderBrush}" />
26-
<Setter Property="BorderThickness" Value="{StaticResource TokenizingTextBoxBorderThickness}" />
26+
<Setter Property="BorderThickness" Value="{StaticResource TextControlBorderThemeThickness}" />
2727
<Setter Property="IsTabStop" Value="False" />
2828
<Setter Property="TabNavigation" Value="Once" />
2929
<Setter Property="IsSwipeEnabled" Value="False" />
@@ -135,6 +135,12 @@
135135

136136
<VisualStateGroup x:Name="FocusStates">
137137
<VisualState x:Name="Focused">
138+
<Storyboard>
139+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="BorderThickness">
140+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBorderThemeThicknessFocused}" />
141+
</ObjectAnimationUsingKeyFrames>
142+
</Storyboard>
143+
138144
<VisualState.Setters>
139145
<Setter Target="FocusVisual.Opacity" Value="1" />
140146
</VisualState.Setters>

0 commit comments

Comments
 (0)