Merge pull request #212 from syncfusion/SegmentedCropIssue

964655- Fix for MAUI Segmented control right side cropped when the stroke thickness is 0

Author: PaulAndersonS

maui/src/SegmentedControl/Helper/SegmentViewHelper.cs

@@ -63,7 +63,7 @@ internal static double GetActualSegmentWidth(ISegmentItemInfo segmentInfo, doubl
 			// Calculated width based on widthRequest and maxWidth.
 			if (widthRequest < 0)
 			{
-				return totalWidth > maxWidth ? maxWidth - keyFocusedViewPadding : totalWidth;
+				return totalWidth + keyFocusedViewPadding > maxWidth ? maxWidth - keyFocusedViewPadding : totalWidth;
 			}
 
 			// Left and right of the keyboard layout in order to avoid the control crop issue while given the heightrequest.

maui/src/SegmentedControl/Views/SegmentItemView.cs

@@ -246,7 +246,6 @@ void DrawRoundedRectangle(ICanvas canvas, RectF dirtyRect)
 			canvas.Antialias = true;
 			float strokeRadius = (float)itemInfo.StrokeThickness / 2f;
 			CornerRadius cornerRadius = itemInfo.SegmentCornerRadius;
-
 			// Calculate corner radius values, subtracting stroke radius when there's stroke thickness
 			float cornerRadiusTopLeft = itemInfo.StrokeThickness > 0 ? (float)cornerRadius.TopLeft - strokeRadius : (float)cornerRadius.TopLeft;
 			float cornerRadiusTopRight = itemInfo.StrokeThickness > 0 ? (float)cornerRadius.TopRight - strokeRadius : (float)cornerRadius.TopRight;
@@ -258,14 +257,6 @@ void DrawRoundedRectangle(ICanvas canvas, RectF dirtyRect)
 			Brush background = isEnabled ? SegmentViewHelper.GetSegmentBackground(itemInfo, _segmentItem) : itemInfo.DisabledSegmentBackground;
 			canvas.FillColor = SegmentViewHelper.BrushToColorConverter(background);
 			canvas.FillRoundedRectangle(dirtyRect.Left, dirtyRect.Top, dirtyRect.Width, dirtyRect.Height, cornerRadiusTopLeft, cornerRadiusTopRight, cornerRadiusBottomRight, cornerRadiusBottomLeft);
-
-			// Only draw stroke if stroke thickness is greater than 0
-			if (itemInfo.StrokeThickness > 0)
-			{
-				canvas.StrokeSize = (float)itemInfo.StrokeThickness;
-				canvas.StrokeColor = SegmentViewHelper.BrushToColorConverter(itemInfo.Stroke);
-			}
-
 			canvas.CanvasRestoreState();
 		}
 

maui/tests/Syncfusion.Maui.Toolkit.UnitTest/Buttons/SfSegmentedControlUnitTests.cs

@@ -895,6 +895,78 @@ public void GetActualSegmentWidth_ReturnsExpectedWidth(double widthRequest, doub
 			Assert.Equal(expectedResult, resultWidth);
 		}
 
+		[Theory]
+		[InlineData(100.0, 50.0, 200.0, LayoutAlignment.Fill, 94.0)]
+		[InlineData(-100.0, 50.0, 200.0, LayoutAlignment.Fill, 194.0)]
+		[InlineData(100.0, 50.0, 100.0, LayoutAlignment.Start, 94.0)]
+		[InlineData(-100.0, 50.0, 200.0, LayoutAlignment.Start, 50.0)]
+		
+		public void GetActualSegmentWidth_ReturnsExpectedWidth_WithStrokethicknessZero(double widthRequest, double minWidth, double maxWidth, LayoutAlignment alignment, double expectedResult)
+		{
+			var segmentInfo = new SfSegmentedControl
+			{
+				_items = [new SfSegmentItem { }, new SfSegmentItem { }],
+				VisibleSegmentsCount = 2,
+				StrokeThickness = 0
+			};
+			var resultWidth = SegmentViewHelper.GetActualSegmentWidth(segmentInfo, widthRequest, minWidth, maxWidth, alignment);
+			Assert.Equal(expectedResult, resultWidth);
+		}
+
+		[Theory]
+		[InlineData(100.0, 50.0, 200.0, LayoutAlignment.Fill, 94.0)]
+		[InlineData(-100.0, 50.0, 200.0, LayoutAlignment.Fill, 194.0)]
+		[InlineData(100.0, 50.0, 100.0, LayoutAlignment.Start, 94.0)]
+		[InlineData(-100.0, 50.0, 200.0, LayoutAlignment.Start, 50.0)]
+
+		public void GetActualSegmentWidth_DifferentCount_ReturnsExpectedWidth_WithStrokethicknessZero(double widthRequest, double minWidth, double maxWidth, LayoutAlignment alignment, double expectedResult)
+		{
+			var segmentInfo = new SfSegmentedControl
+			{
+				_items = [new SfSegmentItem { }, new SfSegmentItem { }],
+				VisibleSegmentsCount = 1,
+				StrokeThickness = 0
+			};
+			var resultWidth = SegmentViewHelper.GetActualSegmentWidth(segmentInfo, widthRequest, minWidth, maxWidth, alignment);
+			Assert.Equal(expectedResult, resultWidth);
+		}
+
+		[Theory]
+		[InlineData(100.0, 50.0, 200.0, LayoutAlignment.Fill, 94.0)]
+		[InlineData(-100.0, 50.0, 200.0, LayoutAlignment.Fill, 194.0)]
+		[InlineData(100.0, 50.0, 100.0, LayoutAlignment.Start, 94.0)]
+		[InlineData(-100.0, 50.0, 200.0, LayoutAlignment.Start, 194.0)]
+
+		public void GetActualSegmentWidth_NegativeCount_ReturnsExpectedWidth_WithStrokethicknessZero(double widthRequest, double minWidth, double maxWidth, LayoutAlignment alignment, double expectedResult)
+		{
+			var segmentInfo = new SfSegmentedControl
+			{
+				_items = [new SfSegmentItem { }, new SfSegmentItem { }],
+				VisibleSegmentsCount = -1,
+				StrokeThickness = 0
+			};
+			var resultWidth = SegmentViewHelper.GetActualSegmentWidth(segmentInfo, widthRequest, minWidth, maxWidth, alignment);
+			Assert.Equal(expectedResult, resultWidth);
+		}
+
+		[Theory]
+		[InlineData(100.0, 50.0, 200.0, LayoutAlignment.Fill, 94.0)]
+		[InlineData(-100.0, 50.0, 200.0, LayoutAlignment.Fill, 194.0)]
+		[InlineData(100.0, 50.0, 100.0, LayoutAlignment.Start, 94.0)]
+		[InlineData(-100.0, 50.0, 200.0, LayoutAlignment.Start, 194.0)]
+
+		public void GetActualSegmentWidth_NegativeCount_ReturnsExpectedWidth_WithStrokethickness(double widthRequest, double minWidth, double maxWidth, LayoutAlignment alignment, double expectedResult)
+		{
+			var segmentInfo = new SfSegmentedControl
+			{
+				_items = [new SfSegmentItem { }, new SfSegmentItem { }],
+				VisibleSegmentsCount = -1,
+				StrokeThickness = 1
+			};
+			var resultWidth = SegmentViewHelper.GetActualSegmentWidth(segmentInfo, widthRequest, minWidth, maxWidth, alignment);
+			Assert.Equal(expectedResult, resultWidth);
+		}
+
 		[Theory]
 		[InlineData(LayoutAlignment.Fill)]
 		[InlineData(LayoutAlignment.Start)]