Skip to content

[pull] main from CommunityToolkit:main #5

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

Open
pull wants to merge 4 commits into
base: main
Choose a base branch
from
+11 −11
Open

[pull] main from CommunityToolkit:main #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ce8a94
Upgraded testspace to latest version 1.0.8
Arlodotexe Jun 15, 2026
2b0269e
Add SegmentedItemBackgroundBrushTransition resource
AndrewKeepCoding Dec 22, 2025
3ffca5b
Added settings action icon direction RTL mirror hotfix
Avid29 May 24, 2026
c076d3d
Removed invalid default value for ActionIcon
Avid29 Jun 2, 2026
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 .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
uses: darenm/setup-vstest@3a16d909a1f3bbc65b52f8270d475d905e7d3e44

- name: Install Testspace Module
uses: testspace-com/setup-testspace@v1
uses: testspace-com/setup-testspace@v1.0.8
with:
domain: ${{ github.repository_owner }}

Expand Down
15 changes: 6 additions & 9 deletions components/Segmented/src/SegmentedItem/SegmentedItem.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@
</ResourceDictionary.ThemeDictionaries>

<x:String x:Key="SegmentedItemScaleAnimationDuration">00:00:00.167</x:String>
<win:BrushTransition x:Key="SegmentedItemBackgroundBrushTransition"
Duration="0:0:0.083" />

<Style BasedOn="{StaticResource DefaultSegmentedItemStyle}"
TargetType="local:SegmentedItem" />
Expand All @@ -374,6 +376,7 @@
<Thickness x:Key="MiddleItemHoverMargin">1, 3, 1, 3</Thickness>
<Thickness x:Key="RightItemHoverMargin">1, 3, 3, 3</Thickness>
<Thickness x:Key="ButtonItemPadding">11</Thickness>

<Style x:Key="DefaultSegmentedItemStyle"
TargetType="local:SegmentedItem">
<Style.Setters>
Expand All @@ -397,13 +400,11 @@
<Grid x:Name="PART_Root"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
Background="{TemplateBinding Background}"
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Control.IsTemplateFocusTarget="True"
CornerRadius="{TemplateBinding CornerRadius}">
<win:Grid.BackgroundTransition>
<win:BrushTransition Duration="0:0:0.083" />
</win:Grid.BackgroundTransition>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="SegmentedOrientationStates">
<VisualState x:Name="Horizontal" />
Expand Down Expand Up @@ -637,11 +638,9 @@
<Border x:Name="PART_Hover"
Margin="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource MarginConverter}}"
Background="Transparent"
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}"
CornerRadius="{TemplateBinding CornerRadius}"
RenderTransformOrigin="0.5, 0.5">
<win:Border.BackgroundTransition>
<win:BrushTransition Duration="0:0:0.083" />
</win:Border.BackgroundTransition>
<Border.RenderTransform>
<CompositeTransform />
</Border.RenderTransform>
Expand Down Expand Up @@ -946,11 +945,9 @@
<Grid x:Name="PART_Root"
Background="{TemplateBinding Background}"
BackgroundSizing="{TemplateBinding BackgroundSizing}"
BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}"
Control.IsTemplateFocusTarget="True"
CornerRadius="{TemplateBinding CornerRadius}">
<win:Grid.BackgroundTransition>
<win:BrushTransition Duration="0:0:0.083" />
</win:Grid.BackgroundTransition>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="SegmentedIconPositionStates">
<VisualState x:Name="IconOnLeft" />
Expand Down
2 changes: 1 addition & 1 deletion components/SettingsControls/src/SettingsCard/SettingsCard.Properties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public partial class SettingsCard : ButtonBase
nameof(ActionIcon),
typeof(IconElement),
typeof(SettingsCard),
new PropertyMetadata(defaultValue: "\ue974"));
new PropertyMetadata(defaultValue: null));

/// <summary>
/// The backing <see cref="DependencyProperty"/> for the <see cref="ActionIconToolTip"/> property.
Expand Down
3 changes: 3 additions & 0 deletions components/SettingsControls/src/SettingsCard/SettingsCard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ public partial class SettingsCard : ButtonBase
public SettingsCard()
{
this.DefaultStyleKey = typeof(SettingsCard);

// This is perhaps indicative of an issue with the action icon requiring a concrete FontElement instead of a template
ActionIcon = new FontIcon { Glyph = "\ue974", MirroredWhenRightToLeft = true };
}

/// <inheritdoc />
Expand Down