[release/8.0.1xx-sr9] Add Padding for iOS Buttons in some scenarios

src/Controls/src/Core/Button/Button.iOS.cs

@@ -144,9 +144,10 @@ Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double he
 				}
 			}
 
-			// if we are in a scenario with unlimited width and the image is on top or bottom, let's make sure the title is not cut off by ensuring we have enough padding for the image and title
-			if (padding == ButtonHandler.DefaultPadding
-				&& image is not null
+			// if we are in a scenario with unlimited width and the image is on top or bottom,
+			// of if the horizontalOption is not fill and the image is on top or bottom,
+			// let's make sure the title is not cut off by ensuring we have enough padding for the image and title.
+			if (image is not null
 				&& (widthConstraint == double.PositiveInfinity || button.HorizontalOptions != LayoutOptions.Fill)
 				&& (layout.Position == ButtonContentLayout.ImagePosition.Top || layout.Position == ButtonContentLayout.ImagePosition.Bottom))
 			{

src/Controls/tests/TestCases.HostApp/Issues/Issue24746.xaml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue24746"
+             Title="Issue24746">
+    <VerticalStackLayout>
+        <HorizontalStackLayout>
+            <Button Text="Hello, longer world!" ImageSource="dotnet_bot_resized2.png"
+                Background="lightgray" ContentLayout="Top,0" AutomationId="TopButton"/>
+        </HorizontalStackLayout>
+
+        <HorizontalStackLayout>
+            <Button Text="Hello, longer world!" ImageSource="dotnet_bot_resized2.png"
+                Background="lightgreen" ContentLayout="Top,0" Padding="0" />
+        </HorizontalStackLayout>
+
+        <HorizontalStackLayout>
+            <Button Text="Hello, longer world!" ImageSource="dotnet_bot_resized2.png"
+                Background="lightblue" ContentLayout="Top,0" Padding="5" />
+        </HorizontalStackLayout>
+
+        <HorizontalStackLayout>
+            <Button Text="Hello, longer world!" ImageSource="dotnet_bot_resized2.png"
+                Background="purple" ContentLayout="Top,0" Padding="50,10" />
+        </HorizontalStackLayout>
+
+        <Button Text="Hello, longer world!" ImageSource="dotnet_bot_resized2.png"
+            Background="lightgray" ContentLayout="Top,0" HorizontalOptions="Center" />
+
+        <Button Text="Hello, longer world!" ImageSource="dotnet_bot_resized2.png" Padding="0"
+            Background="lightgreen" ContentLayout="Top,0" HorizontalOptions="Center" />
+
+        <Button Text="Hello, longer world!" ImageSource="dotnet_bot_resized2.png" Padding="5"
+            Background="lightblue" ContentLayout="Top,0" HorizontalOptions="Center" />
+
+        <Button Text="Hello, longer world!" ImageSource="dotnet_bot_resized2.png" Padding="50,10"
+            Background="purple" ContentLayout="Top,0" HorizontalOptions="Center" />
+
+    </VerticalStackLayout>
+</ContentPage>

src/Controls/tests/TestCases.HostApp/Issues/Issue24746.xaml.cs

@@ -0,0 +1,11 @@
+namespace Maui.Controls.Sample.Issues;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+[Issue(IssueTracker.Github, 24746, "iOS button padding is increased if needed", PlatformAffected.All)]
+public partial class Issue24746 : ContentPage
+{
+	public Issue24746()
+	{
+		InitializeComponent();
+	}
+}

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24746.cs

@@ -0,0 +1,22 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue24746 : _IssuesUITest
+	{
+        public Issue24746(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+        public override string Issue => "iOS button padding is increased if needed";
+
+        [Test]
+        [Category(UITestCategories.Button)]
+        public void ButtonPaddingIsAddedWhenNeeded()
+        {
+            VerifyScreenshot();
+        }
+    }
+}