Skip to content

[TokenView] Fix crash due to unknown brushes #423

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 3 commits into from
Apr 17, 2023
Merged

[TokenView] Fix crash due to unknown brushes #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7d7255
Using the correct WinUI brushes
niels9001 Apr 17, 2023
3bccd42
Bump version number
niels9001 Apr 17, 2023
9b6e214
Remove unused paramaters from sample
niels9001 Apr 17, 2023
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
4 changes: 1 addition & 3 deletions components/TokenView/samples/TokenViewBasicSample.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
mc:Ignorable="d">

<Grid>
<labs:TokenView AllowDrop="True"
CanReorderItems="True"
IsWrapped="{x:Bind IsWrapped, Mode=OneWay}"
<labs:TokenView IsWrapped="{x:Bind IsWrapped, Mode=OneWay}"
SelectedIndex="2"
SelectionMode="{x:Bind local:TokenViewBasicSample.ConvertStringToListViewSelectionMode(SelectionMode), Mode=OneWay}">
<labs:TokenItem Content="All" />
Expand Down
2 changes: 1 addition & 1 deletion components/TokenView/src/CommunityToolkit.Labs.WinUI.TokenView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<ToolkitComponentName>TokenView</ToolkitComponentName>
<Description>This package contains TokenView.</Description>
<Version>0.0.4</Version>
<Version>0.0.5</Version>

<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
<RootNamespace>CommunityToolkit.Labs.WinUI.TokenViewRns</RootNamespace>
Expand Down
10 changes: 5 additions & 5 deletions components/TokenView/src/TokenItem/TokenItem.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
Padding="2"
CornerRadius="99"
IsTabStop="False"
Style="{StaticResource SubtleButtonStyle}"
Style="{StaticResource SubtleAccentButtonStyle}"
Visibility="Collapsed">
<FontIcon FontSize="12"
Glyph="&#xE10A;" />
Expand All @@ -307,7 +307,7 @@

<Style x:Key="SubtleAccentButtonStyle"
TargetType="Button">
<Setter Property="Background" Value="{ThemeResource SubtleButtonBackground}" />
<Setter Property="Background" Value="{ThemeResource SubtleFillColorTransparent}" />
<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
<Setter Property="Foreground" Value="{ThemeResource TextOnAccentFillColorPrimaryBrush}" />
<Setter Property="BorderThickness" Value="0" />
Expand Down Expand Up @@ -349,7 +349,7 @@
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0"
Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
Value="{ThemeResource SubtleFillColorSecondary}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
Storyboard.TargetProperty="Foreground">
Expand All @@ -367,7 +367,7 @@
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0"
Value="{ThemeResource SubtleButtonBackgroundPressed}" />
Value="{ThemeResource SubtleFillColorTertiary}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
Storyboard.TargetProperty="Foreground">
Expand All @@ -385,7 +385,7 @@
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0"
Value="{ThemeResource SubtleButtonBackgroundDisabled}" />
Value="{ThemeResource ControlFillColorDisabled}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
Storyboard.TargetProperty="Foreground">
Expand Down