Merge branch 'main' into Segment/Hover-CornerRadius

Author: Avid29

.config/dotnet-tools.json

@@ -9,7 +9,7 @@
       ]
     },
     "xamlstyler.console": {
-      "version": "3.2206.4",
+      "version": "3.2501.8",
       "commands": [
         "xstyler"
       ]

.github/workflows/build.yml

@@ -32,16 +32,10 @@ env:
 jobs:
   # This workflow contains a single job called "Xaml-Style-Check"
   Xaml-Style-Check:
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # .NET 6 SDK is required for xamlstyler.console to run.
-      - name: Install .NET SDK v6
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 6.0.x
-
       - name: Install .NET SDK v${{ env.DOTNET_VERSION }}
         uses: actions/setup-dotnet@v4
         with:
@@ -63,7 +57,7 @@ jobs:
   # Build both Uno.UI/WinUI2/UWP and Uno.WinUI/WinUI3/WindowsAppSDK versions of our packages using a matrix
   build:
     needs: [Xaml-Style-Check]
-    runs-on: windows-latest-large
+    runs-on: windows-2022
 
     # See https://docs.github.com/actions/using-jobs/using-a-matrix-for-your-jobs
     strategy:
@@ -208,7 +202,7 @@ jobs:
           dotnet-dump analyze ${{ steps.detect-dump.outputs.DUMP_FILE }} -c "clrstack" -c "pe -lines" -c "exit"
 
   package:
-    runs-on: windows-latest-large
+    runs-on: windows-2022
     needs: [build]
     strategy:
       fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them all to run to completion.
@@ -319,7 +313,7 @@ jobs:
   sign:
     needs: [package]
     if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/rel/') }}
-    runs-on: windows-latest
+    runs-on: windows-2022
     permissions:
       id-token: write # Required for requesting the JWT
 

components/ColorPicker/src/ColorPicker.cs

@@ -42,6 +42,7 @@ namespace CommunityToolkit.WinUI.Controls;
 [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground9Border),  Type = typeof(Border))]
 [TemplatePart(Name = nameof(ColorPicker.CheckeredBackground10Border), Type = typeof(Border))]
 [TemplatePart(Name = nameof(ColorPicker.ColorPanelSelector),          Type = typeof(Segmented))]
+[TemplatePart(Name = nameof(ColorPicker.ContentContainer),            Type = typeof(SwitchPresenter))]
 [TemplatePart(Name = nameof(ColorPicker.ColorSpectrumControl),        Type = typeof(ColorSpectrum))]
 [TemplatePart(Name = nameof(ColorPicker.ColorSpectrumAlphaSlider),    Type = typeof(ColorPickerSlider))]
 [TemplatePart(Name = nameof(ColorPicker.ColorSpectrumThirdDimensionSlider), Type = typeof(ColorPickerSlider))]
@@ -74,7 +75,9 @@ public partial class ColorPicker : Microsoft.UI.Xaml.Controls.ColorPicker
     private Color?               updatedRgbColor            = null;
     private DispatcherQueueTimer? dispatcherQueueTimer       = null;
 
-    private Segmented           ColorPanelSelector;
+    private Segmented       ColorPanelSelector;
+    private SwitchPresenter ContentContainer;
+
     private ColorSpectrum     ColorSpectrumControl;
     private ColorPickerSlider ColorSpectrumAlphaSlider;
     private ColorPickerSlider ColorSpectrumThirdDimensionSlider;
@@ -177,6 +180,7 @@ protected override void OnApplyTemplate()
         this.ConnectEvents(false);
 
         this.ColorPanelSelector = (Segmented)GetTemplateChild(nameof(ColorPanelSelector));
+        this.ContentContainer   = (SwitchPresenter)GetTemplateChild(nameof(ContentContainer));
 
         this.ColorSpectrumControl              = (ColorSpectrum)GetTemplateChild(nameof(ColorSpectrumControl));
         this.ColorSpectrumAlphaSlider          = (ColorPickerSlider)this.GetTemplateChild(nameof(ColorSpectrumAlphaSlider));
@@ -255,6 +259,8 @@ private void ConnectEvents(bool connected)
             this.eventsConnected == false)
         {
             // Add all events
+            if (this.ColorPanelSelector != null) { this.ColorPanelSelector.SelectionChanged += this.ColorPanelSelector_SelectionChanged; }
+
             if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.ColorChanged += ColorSpectrum_ColorChanged; }
             if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.GotFocus     += ColorSpectrum_GotFocus; }
             if (this.HexInputTextBox      != null) { this.HexInputTextBox.KeyDown           += HexInputTextBox_KeyDown; }
@@ -299,6 +305,8 @@ private void ConnectEvents(bool connected)
                  this.eventsConnected == true)
         {
             // Remove all events
+            if (this.ColorPanelSelector != null) { this.ColorPanelSelector.SelectionChanged -= this.ColorPanelSelector_SelectionChanged; }
+
             if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.ColorChanged -= ColorSpectrum_ColorChanged; }
             if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.GotFocus     -= ColorSpectrum_GotFocus; }
             if (this.HexInputTextBox      != null) { this.HexInputTextBox.KeyDown           -= HexInputTextBox_KeyDown; }
@@ -1186,6 +1194,22 @@ private void CustomPaletteColors_CollectionChanged(object? sender, NotifyCollect
         return;
     }
 
+    /// <summary>
+    /// Event handler for when the color panel selector selection changes.
+    /// We are setting the value here instead of ElementName binding as a workaround for AoT issues.
+    /// (See https://github.com/microsoft/microsoft-ui-xaml/issues/10214)
+    /// </summary>
+    private void ColorPanelSelector_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (this.ContentContainer is null ||
+            (sender as Segmented)?.SelectedItem is not FrameworkElement selectedItem)
+        {
+            return;
+        }
+
+        this.ContentContainer.Value = selectedItem.Name;
+    }
+
     /// <summary>
     /// Event handler for when the color spectrum color is changed.
     /// This occurs when the user presses on the spectrum to select a new color.

components/ColorPicker/src/ColorPicker.xaml

@@ -237,8 +237,7 @@
                             </controls:Segmented>
 
                             <controls:SwitchPresenter x:Name="ContentContainer"
-                                                      Grid.Row="2"
-                                                      Value="{Binding ElementName=ColorPanelSelector, Path=SelectedItem.Name}">
+                                                      Grid.Row="2">
                                 <controls:Case Value="SpectrumItem">
                                     <Grid HorizontalAlignment="Stretch"
                                           animations:Implicit.HideAnimations="{StaticResource HideTransitions}"

components/SettingsControls/src/SettingsCard/SettingsCard.cs

@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.ComponentModel.Design;
-
 namespace CommunityToolkit.WinUI.Controls;
 
 /// <summary>
@@ -21,6 +19,9 @@ namespace CommunityToolkit.WinUI.Controls;
 [TemplateVisualState(Name = PressedState, GroupName = CommonStates)]
 [TemplateVisualState(Name = DisabledState, GroupName = CommonStates)]
 
+[TemplateVisualState(Name = BitmapHeaderIconEnabledState, GroupName = BitmapHeaderIconStates)]
+[TemplateVisualState(Name = BitmapHeaderIconDisabledState, GroupName = BitmapHeaderIconStates)]
+
 [TemplateVisualState(Name = RightState, GroupName = ContentAlignmentStates)]
 [TemplateVisualState(Name = RightWrappedState, GroupName = ContentAlignmentStates)]
 [TemplateVisualState(Name = RightWrappedNoIconState, GroupName = ContentAlignmentStates)]
@@ -38,6 +39,10 @@ public partial class SettingsCard : ButtonBase
     internal const string PressedState = "Pressed";
     internal const string DisabledState = "Disabled";
 
+    internal const string BitmapHeaderIconStates = "BitmapHeaderIconStates";
+    internal const string BitmapHeaderIconEnabledState = "BitmapHeaderIconEnabled";
+    internal const string BitmapHeaderIconDisabledState = "BitmapHeaderIconDisabled";
+
     internal const string ContentAlignmentStates = "ContentAlignmentStates";
     internal const string RightState = "Right";
     internal const string RightWrappedState = "RightWrapped";
@@ -76,7 +81,7 @@ protected override void OnApplyTemplate()
         CheckInitialVisualState();
         SetAccessibleContentName();
         RegisterPropertyChangedCallback(ContentProperty, OnContentChanged);
-        IsEnabledChanged += OnIsEnabledChanged;     
+        IsEnabledChanged += OnIsEnabledChanged;
     }
 
     private void CheckInitialVisualState()
@@ -89,6 +94,8 @@ private void CheckInitialVisualState()
             CheckVerticalSpacingState(contentAlignmentStatesGroup.CurrentState);
             contentAlignmentStatesGroup.CurrentStateChanged += this.ContentAlignmentStates_Changed;
         }
+
+        CheckHeaderIconState();
     }
 
     // We automatically set the AutomationProperties.Name of the Content if not configured.
@@ -183,7 +190,6 @@ private void Control_PointerCanceled(object sender, PointerRoutedEventArgs e)
     /// </summary>
     protected override void OnPointerPressed(PointerRoutedEventArgs e)
     {
-        //  e.Handled = true;
         if (IsClickEnabled)
         {
             base.OnPointerPressed(e);
@@ -228,6 +234,18 @@ private void OnIsClickEnabledChanged()
     private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
     {
         VisualStateManager.GoToState(this, IsEnabled ? NormalState : DisabledState, true);
+
+        CheckHeaderIconState();
+    }
+    
+    private void CheckHeaderIconState()
+    {
+        // The Disabled visual state will only set the right Foreground brush, but for images we need to lower the opacity so it looks disabled.
+        
+        if (HeaderIcon is BitmapIcon)
+        {
+            VisualStateManager.GoToState(this, IsEnabled ? BitmapHeaderIconEnabledState : BitmapHeaderIconDisabledState, true);
+        }
     }
 
     private void OnActionIconChanged()
@@ -240,7 +258,7 @@ private void OnActionIconChanged()
             }
             else
             {
-                actionIconPresenter.Visibility =Visibility.Collapsed;
+                actionIconPresenter.Visibility = Visibility.Collapsed;
             }
         }
     }

components/SettingsControls/src/SettingsCard/SettingsCard.xaml

@@ -109,6 +109,7 @@
     <x:Double x:Key="SettingsCardVerticalHeaderContentSpacing">8</x:Double>
     <x:Double x:Key="SettingsCardWrapThreshold">476</x:Double>
     <x:Double x:Key="SettingsCardWrapNoIconThreshold">286</x:Double>
+    <x:Double x:Key="SettingsCardBitmapIconDisabledOpacity">0.4</x:Double>
 
     <Style BasedOn="{StaticResource DefaultSettingsCardStyle}"
            TargetType="local:SettingsCard" />
@@ -294,6 +295,16 @@
                                     </VisualState>
                                 </VisualStateGroup>
 
+                                <!--  These states are only relevant if a BitmapIcon is used as HeaderIcon or ActionIcon.  -->
+                                <VisualStateGroup x:Name="BitmapHeaderIconStates">
+                                    <VisualState x:Name="BitmapHeaderIconEnabled" />
+                                    <VisualState x:Name="BitmapHeaderIconDisabled">
+                                        <VisualState.Setters>
+                                            <Setter Target="PART_HeaderIconPresenterHolder.Opacity" Value="{StaticResource SettingsCardBitmapIconDisabledOpacity}" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                </VisualStateGroup>
+
                                 <VisualStateGroup x:Name="ContentAlignmentStates">
                                     <!--  Default  -->
                                     <VisualState x:Name="Right" />