From fd30173509117f84c04055fb22b92923095ea97e Mon Sep 17 00:00:00 2001
From: Andrew KeepCoding <andrewkeepcoding@gmail.com>
Date: Mon, 22 Dec 2025 15:55:28 +0900
Subject: [PATCH 1/2] Add SegmentedItemBackgroundBrushTransition resource

---
 .../src/SegmentedItem/SegmentedItem.xaml      | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/components/Segmented/src/SegmentedItem/SegmentedItem.xaml b/components/Segmented/src/SegmentedItem/SegmentedItem.xaml
index f0ee77f5..0872bed9 100644
--- a/components/Segmented/src/SegmentedItem/SegmentedItem.xaml
+++ b/components/Segmented/src/SegmentedItem/SegmentedItem.xaml
@@ -361,7 +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" />
 
@@ -374,6 +375,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>
@@ -400,11 +402,9 @@
                               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>
+                              CornerRadius="{TemplateBinding CornerRadius}"
+                              BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}">
+                             <VisualStateManager.VisualStateGroups>
                                 <VisualStateGroup x:Name="SegmentedIconPositionStates">
                                     <VisualState x:Name="IconOnLeft" />
                                     <VisualState x:Name="IconOnly">
@@ -615,10 +615,8 @@
                                     Margin="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource MarginConverter}}"
                                     Background="Transparent"
                                     CornerRadius="{TemplateBinding CornerRadius}"
-                                    RenderTransformOrigin="0.5, 0.5">
-                                <win:Border.BackgroundTransition>
-                                    <win:BrushTransition Duration="0:0:0.083" />
-                                </win:Border.BackgroundTransition>
+                                    RenderTransformOrigin="0.5, 0.5"
+                                    BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}">
                                 <Border.RenderTransform>
                                     <CompositeTransform />
                                 </Border.RenderTransform>
@@ -926,10 +924,8 @@
                               Background="{TemplateBinding Background}"
                               BackgroundSizing="{TemplateBinding BackgroundSizing}"
                               Control.IsTemplateFocusTarget="True"
-                              CornerRadius="{TemplateBinding CornerRadius}">
-                            <win:Grid.BackgroundTransition>
-                                <win:BrushTransition Duration="0:0:0.083" />
-                            </win:Grid.BackgroundTransition>
+                              CornerRadius="{TemplateBinding CornerRadius}"
+                              BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}">
                             <VisualStateManager.VisualStateGroups>
                                 <VisualStateGroup x:Name="SegmentedIconPositionStates">
                                     <VisualState x:Name="IconOnLeft" />

From 78520e65a43ef024dfd08441aa60e08ef11f6e50 Mon Sep 17 00:00:00 2001
From: Andrew KeepCoding <andrewkeepcoding@gmail.com>
Date: Tue, 6 Jan 2026 11:49:36 +0900
Subject: [PATCH 2/2] Fix XAML styling

---
 .../src/SegmentedItem/SegmentedItem.xaml      | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/components/Segmented/src/SegmentedItem/SegmentedItem.xaml b/components/Segmented/src/SegmentedItem/SegmentedItem.xaml
index 0872bed9..ea27703a 100644
--- a/components/Segmented/src/SegmentedItem/SegmentedItem.xaml
+++ b/components/Segmented/src/SegmentedItem/SegmentedItem.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="using:CommunityToolkit.WinUI.Controls"
                     xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
@@ -361,8 +361,9 @@
     </ResourceDictionary.ThemeDictionaries>
 
     <x:String x:Key="SegmentedItemScaleAnimationDuration">00:00:00.167</x:String>
-    <win:BrushTransition x:Key="SegmentedItemBackgroundBrushTransition" Duration="0:0:0.083" />
-    
+    <win:BrushTransition x:Key="SegmentedItemBackgroundBrushTransition"
+                         Duration="0:0:0.083" />
+
     <Style BasedOn="{StaticResource DefaultSegmentedItemStyle}"
            TargetType="local:SegmentedItem" />
 
@@ -399,12 +400,12 @@
                         <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}"
-                              BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}">
-                             <VisualStateManager.VisualStateGroups>
+                              CornerRadius="{TemplateBinding CornerRadius}">
+                            <VisualStateManager.VisualStateGroups>
                                 <VisualStateGroup x:Name="SegmentedIconPositionStates">
                                     <VisualState x:Name="IconOnLeft" />
                                     <VisualState x:Name="IconOnly">
@@ -614,9 +615,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"
-                                    BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}">
+                                    RenderTransformOrigin="0.5, 0.5">
                                 <Border.RenderTransform>
                                     <CompositeTransform />
                                 </Border.RenderTransform>
@@ -923,9 +924,9 @@
                         <Grid x:Name="PART_Root"
                               Background="{TemplateBinding Background}"
                               BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                              BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}"
                               Control.IsTemplateFocusTarget="True"
-                              CornerRadius="{TemplateBinding CornerRadius}"
-                              BackgroundTransition="{ThemeResource SegmentedItemBackgroundBrushTransition}">
+                              CornerRadius="{TemplateBinding CornerRadius}">
                             <VisualStateManager.VisualStateGroups>
                                 <VisualStateGroup x:Name="SegmentedIconPositionStates">
                                     <VisualState x:Name="IconOnLeft" />