Skip to content

Updates to TokenizingTextBox Style to be consistent whether or not WinUI is included #3314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michael-hawker merged 5 commits into from
Jun 2, 2020
Merged

Updates to TokenizingTextBox Style to be consistent whether or not WinUI is included #3314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6f856d
Fix Issue with WinUI disrupting padding of TokenizingTextBox
michael-hawker May 29, 2020
54c81e1
Update Focus Visual to adapt to platform values if WinUI being used
michael-hawker May 29, 2020
0b9e8e5
Fix Style warning
michael-hawker May 29, 2020
fcd7a9b
Update Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/Tokenizing…
michael-hawker May 29, 2020
24c30ed
Merge branch 'master' into mhawker/ttb-style
michael-hawker Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
{
// ignore
}

deferral.Complete();
}
}
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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">
Expand Down
6 changes: 3 additions & 3 deletions Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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" />
Expand Down Expand Up @@ -136,6 +136,7 @@
<VisualStateGroup x:Name="FocusStates">
<VisualState x:Name="Focused">
<VisualState.Setters>
<Setter Target="FocusVisual.BorderThickness" Value="{ThemeResource TextControlBorderThemeThicknessFocused}" />
<Setter Target="FocusVisual.Opacity" Value="1" />
</VisualState.Setters>
</VisualState>
Expand All @@ -145,4 +146,3 @@
</Grid>
</ControlTemplate>
</ResourceDictionary>

3 changes: 3 additions & 0 deletions ...osoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down