Addressed simple code style suggestions from Arlo

Author: Avid29

components/Segmented/src/EqualPanel.cs

@@ -2,7 +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 Microsoft.UI.Xaml.Controls;
 using System.Data;
 
 namespace CommunityToolkit.WinUI.Controls;
@@ -77,46 +76,45 @@ protected override Size MeasureOverride(Size availableSize)
             _maxItemHeight = Math.Max(_maxItemHeight, child.DesiredSize.Height);
         }
 
-        if (_visibleItemsCount > 0)
+        // No children, no space taken
+        if (_visibleItemsCount <= 0)
+            return new Size(0, 0);
+
+        // Determine if the desired alignment is stretched.
+        // Don't stretch if infinite space is available though. Attempting to divide infinite space will result in a crash.
+        bool stretch = Orientation switch
         {
-            bool stretch = Orientation switch
-            {
-                Orientation.Horizontal => HorizontalAlignment is HorizontalAlignment.Stretch && !double.IsInfinity(availableSize.Width),
-                Orientation.Vertical or _ => VerticalAlignment is VerticalAlignment.Stretch && !double.IsInfinity(availableSize.Height),
-            };
-
-            // Define XY coords
-            double xSize = 0, ySize = 0;
-
-            // Define UV coords for orientation agnostic XY manipulation
-            ref double uSize = ref SelectAxis(Orientation, ref xSize, ref ySize, true);
-            ref double vSize = ref SelectAxis(Orientation, ref xSize, ref ySize, false);
-            ref double maxItemU = ref SelectAxis(Orientation, ref _maxItemWidth, ref _maxItemHeight, true);
-            ref double maxItemV = ref SelectAxis(Orientation, ref _maxItemWidth, ref _maxItemHeight, false);
-            double availableU = Orientation is Orientation.Horizontal ? availableSize.Width : availableSize.Height;
-
-            if (stretch)
-            {
-                // Adjust maxItemU to form equal rows/columns by available U space (adjust for spacing)
-                double totalU = availableU - (Spacing * (_visibleItemsCount - 1));
-                maxItemU = totalU / _visibleItemsCount;
-
-                // Set uSize/vSize for XY result construction
-                uSize = availableU;
-                vSize = maxItemV;
-            }
-            else
-            {
-                uSize = (maxItemU * _visibleItemsCount) + (Spacing * (_visibleItemsCount - 1));
-                vSize = maxItemV;
-            }
-
-            return new Size(xSize, ySize);
+            Orientation.Horizontal => HorizontalAlignment is HorizontalAlignment.Stretch && !double.IsInfinity(availableSize.Width),
+            Orientation.Vertical or _ => VerticalAlignment is VerticalAlignment.Stretch && !double.IsInfinity(availableSize.Height),
+        };
+
+        // Define XY coords
+        double xSize = 0, ySize = 0;
+
+        // Define UV coords for orientation agnostic XY manipulation
+        ref double uSize = ref SelectAxis(Orientation, ref xSize, ref ySize, true);
+        ref double vSize = ref SelectAxis(Orientation, ref xSize, ref ySize, false);
+        ref double maxItemU = ref SelectAxis(Orientation, ref _maxItemWidth, ref _maxItemHeight, true);
+        ref double maxItemV = ref SelectAxis(Orientation, ref _maxItemWidth, ref _maxItemHeight, false);
+        double availableU = Orientation is Orientation.Horizontal ? availableSize.Width : availableSize.Height;
+
+        if (stretch)
+        {
+            // Adjust maxItemU to form equal rows/columns by available U space (adjust for spacing)
+            double totalU = availableU - (Spacing * (_visibleItemsCount - 1));
+            maxItemU = totalU / _visibleItemsCount;
+
+            // Set uSize/vSize for XY result construction
+            uSize = availableU;
+            vSize = maxItemV;
         }
         else
         {
-            return new Size(0, 0);
+            uSize = (maxItemU * _visibleItemsCount) + (Spacing * (_visibleItemsCount - 1));
+            vSize = maxItemV;
         }
+
+        return new Size(xSize, ySize);
     }
 
     /// <inheritdoc/>

components/Segmented/src/SegmentedItem/SegmentedItem.cs

@@ -32,7 +32,7 @@ public SegmentedItem()
     protected override void OnApplyTemplate()
     {
         base.OnApplyTemplate();
-        UpdateState();
+        UpdateVisualStates();
     }
 
     /// <summary>
@@ -41,21 +41,21 @@ protected override void OnApplyTemplate()
     protected override void OnContentChanged(object oldContent, object newContent)
     {
         base.OnContentChanged(oldContent, newContent);
-        UpdateState();
+        UpdateVisualStates();
     }
 
     /// <summary>
     /// Handles changes to the Icon property.
     /// </summary>
-    protected virtual void OnIconPropertyChanged(IconElement oldValue, IconElement newValue) => UpdateState();
+    protected virtual void OnIconPropertyChanged(IconElement oldValue, IconElement newValue) => UpdateVisualStates();
 
     internal void UpdateOrientation(Orientation orientation)
     {
         _isVertical = orientation is Orientation.Vertical;
-        UpdateState();
+        UpdateVisualStates();
     }
 
-    private void UpdateState()
+    private void UpdateVisualStates()
     {
         string contentState = (Icon is null, Content is null) switch
         {
@@ -65,7 +65,7 @@ private void UpdateState()
             (true, true) => ContentOnlyState, // Invalid state. Treat as content only
         };
 
-        // Update states
+        // Update visual states
         VisualStateManager.GoToState(this, contentState, true);
         VisualStateManager.GoToState(this, _isVertical ? VerticalState : HorizontalState, true);
     }