Skip to content

Commit c55b3a8

Browse files
authored
[TokenView] Fix crash due to unknown brushes (#423)
* Using the correct WinUI brushes * Bump version number * Remove unused paramaters from sample
1 parent 2eaaa48 commit c55b3a8

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

components/TokenView/samples/TokenViewBasicSample.xaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
mc:Ignorable="d">
1010

1111
<Grid>
12-
<labs:TokenView AllowDrop="True"
13-
CanReorderItems="True"
14-
IsWrapped="{x:Bind IsWrapped, Mode=OneWay}"
12+
<labs:TokenView IsWrapped="{x:Bind IsWrapped, Mode=OneWay}"
1513
SelectedIndex="2"
1614
SelectionMode="{x:Bind local:TokenViewBasicSample.ConvertStringToListViewSelectionMode(SelectionMode), Mode=OneWay}">
1715
<labs:TokenItem Content="All" />

components/TokenView/src/CommunityToolkit.Labs.WinUI.TokenView.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<ToolkitComponentName>TokenView</ToolkitComponentName>
44
<Description>This package contains TokenView.</Description>
5-
<Version>0.0.4</Version>
5+
<Version>0.0.5</Version>
66

77
<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
88
<RootNamespace>CommunityToolkit.Labs.WinUI.TokenViewRns</RootNamespace>

components/TokenView/src/TokenItem/TokenItem.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
Padding="2"
294294
CornerRadius="99"
295295
IsTabStop="False"
296-
Style="{StaticResource SubtleButtonStyle}"
296+
Style="{StaticResource SubtleAccentButtonStyle}"
297297
Visibility="Collapsed">
298298
<FontIcon FontSize="12"
299299
Glyph="&#xE10A;" />
@@ -307,7 +307,7 @@
307307

308308
<Style x:Key="SubtleAccentButtonStyle"
309309
TargetType="Button">
310-
<Setter Property="Background" Value="{ThemeResource SubtleButtonBackground}" />
310+
<Setter Property="Background" Value="{ThemeResource SubtleFillColorTransparent}" />
311311
<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
312312
<Setter Property="Foreground" Value="{ThemeResource TextOnAccentFillColorPrimaryBrush}" />
313313
<Setter Property="BorderThickness" Value="0" />
@@ -349,7 +349,7 @@
349349
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
350350
Storyboard.TargetProperty="Background">
351351
<DiscreteObjectKeyFrame KeyTime="0"
352-
Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
352+
Value="{ThemeResource SubtleFillColorSecondary}" />
353353
</ObjectAnimationUsingKeyFrames>
354354
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
355355
Storyboard.TargetProperty="Foreground">
@@ -367,7 +367,7 @@
367367
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
368368
Storyboard.TargetProperty="Background">
369369
<DiscreteObjectKeyFrame KeyTime="0"
370-
Value="{ThemeResource SubtleButtonBackgroundPressed}" />
370+
Value="{ThemeResource SubtleFillColorTertiary}" />
371371
</ObjectAnimationUsingKeyFrames>
372372
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
373373
Storyboard.TargetProperty="Foreground">
@@ -385,7 +385,7 @@
385385
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
386386
Storyboard.TargetProperty="Background">
387387
<DiscreteObjectKeyFrame KeyTime="0"
388-
Value="{ThemeResource SubtleButtonBackgroundDisabled}" />
388+
Value="{ThemeResource ControlFillColorDisabled}" />
389389
</ObjectAnimationUsingKeyFrames>
390390
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
391391
Storyboard.TargetProperty="Foreground">

0 commit comments

Comments
 (0)