Skip to content

Fix TokenizingTextBox header to behave like normal text control headers #4101

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
merged 4 commits into from
Sep 2, 2021
Merged

Fix TokenizingTextBox header to behave like normal text control headers #4101

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6c65a5
Fix TokenizingTextBox header to behave like normal headers
marcelwgn Jul 8, 2021
6845464
Fix formatting
marcelwgn Jul 8, 2021
7f04027
Fix formatting the second
marcelwgn Jul 8, 2021
5540ece
Add footer templatepart
marcelwgn Jul 27, 2021
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
33 changes: 26 additions & 7 deletions Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,35 @@
<ControlTemplate x:Key="TokenizingTextBoxTemplate"
TargetType="controls:TokenizingTextBox">
<Grid Name="RootPanel">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>

<ContentPresenter Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
Transitions="{TemplateBinding HeaderTransitions}"
FontWeight="Normal"
Foreground="{ThemeResource TextControlHeaderForeground}"
Margin="{ThemeResource TextBoxTopHeaderMargin}"
TextWrapping="Wrap"
VerticalAlignment="Top" />
<Border x:Name="BackgroundVisual"
Grid.Row="1"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" />

<Border x:Name="FocusVisual"
Grid.Row="1"
Background="{ThemeResource SystemControlBackgroundAltHighBrush}"
BorderBrush="{ThemeResource TextControlBorderBrushFocused}"
BorderThickness="{TemplateBinding BorderThickness}"
Opacity="0" /> <!-- Background in WinUI is TextControlBackgroundFocused, but that uses a different resource in WinUI than system -->

<ScrollViewer x:Name="ScrollViewer"
Grid.Row="1"
AutomationProperties.AccessibilityView="Raw"
BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
Expand All @@ -92,15 +109,17 @@
ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">

<ItemsPresenter Padding="{TemplateBinding Padding}"
Margin="{StaticResource TokenizingTextBoxPresenterMargin}"
Footer="{TemplateBinding Footer}"
FooterTemplate="{TemplateBinding FooterTemplate}"
FooterTransitions="{TemplateBinding FooterTransitions}"
Header="{TemplateBinding Header}"
HeaderTemplate="{TemplateBinding HeaderTemplate}"
HeaderTransitions="{TemplateBinding HeaderTransitions}" />
Margin="{StaticResource TokenizingTextBoxPresenterMargin}"/>
</ScrollViewer>

<ContentPresenter Grid.Row="2"
Content="{TemplateBinding Footer}"
ContentTemplate="{TemplateBinding FooterTemplate}"
Transitions="{TemplateBinding FooterTransitions}"
FontWeight="Normal"
TextWrapping="Wrap"
VerticalAlignment="Top" />

<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Disabled">
Expand Down