diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
index 6ad737cb367a..1338bd8e6dce 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
@@ -175,7 +175,7 @@
ContentLayout="Right" TextColor="White" Background="Black"
ImageSource="settings.png" Text="settings" />
+
+
+
diff --git a/src/Controls/src/Core/Button/Button.Mapper.cs b/src/Controls/src/Core/Button/Button.Mapper.cs
index 95b52799b428..f31eebfb702e 100644
--- a/src/Controls/src/Core/Button/Button.Mapper.cs
+++ b/src/Controls/src/Core/Button/Button.Mapper.cs
@@ -23,6 +23,7 @@ public partial class Button
ButtonHandler.Mapper.ReplaceMapping(nameof(ContentLayout), MapContentLayout);
#if IOS
ButtonHandler.Mapper.ReplaceMapping(nameof(Padding), MapPadding);
+ ButtonHandler.Mapper.ReplaceMapping(nameof(BorderWidth), MapBorderWidth);
#endif
#if WINDOWS
ButtonHandler.Mapper.ReplaceMapping(nameof(ImageSource), MapImageSource);
diff --git a/src/Controls/src/Core/Button/Button.iOS.cs b/src/Controls/src/Core/Button/Button.iOS.cs
index 8a7c0ea836ae..d1bca94a1b21 100644
--- a/src/Controls/src/Core/Button/Button.iOS.cs
+++ b/src/Controls/src/Core/Button/Button.iOS.cs
@@ -5,16 +5,448 @@
using Microsoft.Maui.Controls.Platform;
using Microsoft.Maui.Graphics;
using Microsoft.Maui.Handlers;
+using UIKit;
+using CoreGraphics;
+using Microsoft.Extensions.Logging;
+using Microsoft.Maui.Layouts;
namespace Microsoft.Maui.Controls
{
- public partial class Button
+ public partial class Button : ICrossPlatformLayout
{
- protected override Size ArrangeOverride(Rect bounds)
+ CGSize _originalImageSize = CGSize.Empty;
+
+ // _isFirstMeasure is a flag to make sure we manually recalculate the titleRect when there are dynamic changes to the button.
+ // There are times the platformButton.TitleLabel is updated on dynamic changes and reacts to the change by truncating the label when we actually
+ // have space in our constraints. We provide the space to be used in our first measure of the titleRect and then use the newly laid out titleRect in later iterations.
+ bool _isFirstMeasure = true;
+
+ ///
+ /// Measure the desired size of the button based on the image and title size taking into account
+ /// the padding, spacing, margins, borders, and image placement.
+ /// This method will also try to resize the image if it is too large for the button.
+ ///
+ ///
+ ///
+ /// Returns a representing the width and height of the button.
+ /// This method is used to pseudo-override the SizeThatFits() on the UIButton since we cannot override the UIButton class.
+ Size ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint, double heightConstraint)
+ {
+ var button = this;
+
+ var platformButton = Handler?.PlatformView as UIButton;
+
+ if (button is null || platformButton is null)
+ {
+ return Size.Zero;
+ }
+
+ var layout = button.ContentLayout;
+ var spacing = (nfloat)layout.Spacing;
+ var borderWidth = button.BorderWidth < 0 ? 0 : button.BorderWidth;
+
+ // if the image is too large then we just position at the edge of the button
+ // depending on the position the user has picked
+ // This makes the behavior consistent with android
+ var contentMode = UIViewContentMode.Center;
+
+ var padding = button.Padding;
+ if (padding.IsNaN)
+ padding = ButtonHandler.DefaultPadding;
+
+ var image = platformButton.CurrentImage;
+
+ // We can use the ContentEdgeInsets to provide space for the border.
+ // If the image is on the left or right, we can also incorporate the padding and spacing in the ContentEdgeInsets so that the title does not try to use that extra space.
+ var contentEdgeInsets = new Thickness(borderWidth);
+ if (image is not null && !string.IsNullOrEmpty(platformButton.CurrentTitle)
+ && (layout.Position == ButtonContentLayout.ImagePosition.Left || layout.Position == ButtonContentLayout.ImagePosition.Right))
+ {
+ contentEdgeInsets.Left += (nfloat)padding.Left + layout.Spacing / 2;
+ contentEdgeInsets.Right += (nfloat)padding.Right + layout.Spacing / 2;
+ contentEdgeInsets.Top += (nfloat)padding.Top;
+ contentEdgeInsets.Bottom += (nfloat)padding.Bottom;
+ }
+ else if (image is not null && !string.IsNullOrEmpty(platformButton.CurrentTitle)
+ && (layout.Position == ButtonContentLayout.ImagePosition.Top || layout.Position == ButtonContentLayout.ImagePosition.Bottom))
+ {
+ // in this scenario, we won't add the Left and Right padding to the ContentEdgeInsets because the button will use that space before moving the image and title
+ contentEdgeInsets.Top += (nfloat)padding.Top + layout.Spacing / 2;
+ contentEdgeInsets.Bottom += (nfloat)padding.Bottom + layout.Spacing / 2;
+ }
+ else if (image is null || string.IsNullOrEmpty(platformButton.CurrentTitle))
+ {
+ contentEdgeInsets.Left += (nfloat)padding.Left;
+ contentEdgeInsets.Right += (nfloat)padding.Right;
+ contentEdgeInsets.Top += (nfloat)padding.Top;
+ contentEdgeInsets.Bottom += (nfloat)padding.Bottom;
+ }
+ platformButton.UpdateContentEdgeInsets(button, contentEdgeInsets);
+
+ if (image is not null)
+ {
+ // Save the original image size for later image resizing
+ if (_originalImageSize == CGSize.Empty)
+ {
+ _originalImageSize = image.Size;
+ }
+
+ // Resize the image if necessary and then update the image variable
+ if (ResizeImageIfNecessary(platformButton, button, image, padding, spacing, borderWidth, widthConstraint, heightConstraint, _originalImageSize))
+ {
+ image = platformButton.CurrentImage;
+ }
+ }
+
+ platformButton.ImageView.ContentMode = contentMode;
+
+ // This is used to match the behavior between platforms.
+ // If the image is too big then we just hide the label because
+ // the image is pushing the title out of the visible view.
+ // We can't use insets because then the title shows up outside the
+ // bounds of the UIButton. We could set the UIButton to clip bounds
+ // but that feels like it might cause confusing side effects
+ if (contentMode == UIViewContentMode.Center)
+ platformButton.TitleLabel.Layer.Hidden = false;
+ else
+ platformButton.TitleLabel.Layer.Hidden = true;
+
+ var titleRect = ComputeTitleRect(platformButton, button, image, widthConstraint, heightConstraint, borderWidth, padding, true);
+
+ var titleRectWidth = titleRect.Width;
+ var titleRectHeight = titleRect.Height;
+
+ var buttonContentWidth =
+ + (nfloat)Math.Max(titleRectWidth, platformButton.CurrentImage?.Size.Width ?? 0)
+ + (nfloat)padding.Left
+ + (nfloat)padding.Right
+ + (nfloat)borderWidth * 2;
+
+ var buttonContentHeight =
+ + (nfloat)Math.Max(titleRectHeight, platformButton.CurrentImage?.Size.Height ?? 0)
+ + (nfloat)padding.Top
+ + (nfloat)padding.Bottom
+ + (nfloat)borderWidth * 2;
+
+ // if we have both an image and title, add the smaller of the two to the calculation as well
+ if (image is not null && !string.IsNullOrEmpty(platformButton.CurrentTitle))
+ {
+ if (layout.Position == ButtonContentLayout.ImagePosition.Top || layout.Position == ButtonContentLayout.ImagePosition.Bottom)
+ {
+ buttonContentHeight += spacing;
+ buttonContentHeight += (nfloat)Math.Min(titleRectHeight, platformButton.CurrentImage?.Size.Height ?? 0);
+ }
+
+ else
+ {
+ buttonContentWidth += spacing;
+ buttonContentWidth += (nfloat)Math.Min(titleRectWidth, platformButton.CurrentImage?.Size.Width ?? 0);
+ }
+ }
+
+ // 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
+ && (widthConstraint == double.PositiveInfinity || button.HorizontalOptions != LayoutOptions.Fill)
+ && (layout.Position == ButtonContentLayout.ImagePosition.Top || layout.Position == ButtonContentLayout.ImagePosition.Bottom))
+ {
+ var maxTitleRect = ComputeTitleRect(platformButton, button, image, double.PositiveInfinity, double.PositiveInfinity, borderWidth, padding, true);
+
+ var smallerWidth = (nfloat)Math.Min(maxTitleRect.Width, platformButton.CurrentImage?.Size.Width ?? 0);
+ if (padding.HorizontalThickness < smallerWidth)
+ {
+ buttonContentWidth += (nfloat)(smallerWidth - padding.HorizontalThickness);
+ }
+ }
+
+ var returnSize = new Size(Math.Min(buttonContentWidth, widthConstraint),
+ Math.Min(buttonContentHeight, heightConstraint));
+
+ _isFirstMeasure = false;
+
+ // Rounding the values up to the nearest whole number to match UIView.SizeThatFits
+ return new Size((int)Math.Ceiling(returnSize.Width), (int)Math.Ceiling(returnSize.Height));
+ }
+
+ ///
+ /// Arrange the button and layout the image and title.
+ ///
+ ///
+ /// Returns a representing the width and height of the button.
+ Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds)
+ {
+ bounds = this.ComputeFrame(bounds);
+
+ var platformButton = Handler?.PlatformView as UIButton;
+
+ // Layout the image and title of the button
+ LayoutButton(platformButton, this, bounds);
+
+ _isFirstMeasure = true;
+
+ return new Size(bounds.Width, bounds.Height);
+ }
+
+ ///
+ /// Calculate and layout the image and title insets of the UIButton.
+ ///
+ ///
+ ///
+ ///
+ /// TitleEdgeInsets and ImageEdgeInsets are deprecated in iOS 15. The layout process will change with UIButton.Configuration API in the future.
+ void LayoutButton(UIButton platformButton, Button button, Rect size)
+ {
+ var layout = button.ContentLayout;
+ var spacing = (nfloat)layout.Spacing;
+ var borderWidth = button.BorderWidth < 0 ? 0 : button.BorderWidth;
+
+ var imageInsets = new UIEdgeInsets();
+ var titleInsets = new UIEdgeInsets();
+
+ var image = platformButton.CurrentImage;
+
+ if (image is not null && !string.IsNullOrEmpty(platformButton.CurrentTitle))
+ {
+ var padding = button.Padding;
+ if (padding.IsNaN)
+ {
+ padding = ButtonHandler.DefaultPadding;
+ }
+ var titleRect = ComputeTitleRect(platformButton, button, image, size.Width, size.Height, borderWidth, padding, false);
+
+ var titleWidth = titleRect.Width;
+ var titleHeight = titleRect.Height;
+ var imageWidth = image.Size.Width;
+ var imageHeight = image.Size.Height;
+ var sharedSpacing = spacing / 2;
+
+ // These are just used to shift the image and title to center
+ // Which makes the later math easier to follow
+ imageInsets.Left += titleWidth / 2;
+ imageInsets.Right -= titleWidth / 2;
+ titleInsets.Left -= imageWidth / 2;
+ titleInsets.Right += imageWidth / 2;
+
+ if (layout.Position == ButtonContentLayout.ImagePosition.Top)
+ {
+ imageInsets.Top -= (titleHeight / 2) + sharedSpacing;
+ imageInsets.Bottom += (titleHeight / 2) + sharedSpacing;
+
+ titleInsets.Top += (imageHeight / 2) + sharedSpacing;
+ titleInsets.Bottom -= (imageHeight / 2) + sharedSpacing;
+ }
+ else if (layout.Position == ButtonContentLayout.ImagePosition.Bottom)
+ {
+ imageInsets.Top += (titleHeight / 2) + sharedSpacing;
+ imageInsets.Bottom -= (titleHeight / 2) + sharedSpacing;
+
+ titleInsets.Top -= (imageHeight / 2) + sharedSpacing;
+ titleInsets.Bottom += (imageHeight / 2) + sharedSpacing;
+ }
+ else if (layout.Position == ButtonContentLayout.ImagePosition.Left)
+ {
+ imageInsets.Left -= (titleWidth / 2) + sharedSpacing;
+ imageInsets.Right += (titleWidth / 2) + sharedSpacing;
+
+ titleInsets.Left += (imageWidth / 2) + sharedSpacing;
+ titleInsets.Right -= (imageWidth / 2) + sharedSpacing;
+
+ }
+ else if (layout.Position == ButtonContentLayout.ImagePosition.Right)
+ {
+ imageInsets.Left += (titleWidth / 2) + sharedSpacing;
+ imageInsets.Right -= (titleWidth / 2) + sharedSpacing;
+
+ titleInsets.Left -= (imageWidth / 2) + sharedSpacing;
+ titleInsets.Right += (imageWidth / 2) + sharedSpacing;
+ }
+ }
+
+#pragma warning disable CA1416, CA1422
+ if (platformButton.ImageEdgeInsets != imageInsets ||
+ platformButton.TitleEdgeInsets != titleInsets)
+ {
+ platformButton.ImageEdgeInsets = imageInsets;
+ platformButton.TitleEdgeInsets = titleInsets;
+ }
+#pragma warning restore CA1416, CA1422
+ }
+
+ ///
+ /// Estimate the size of the rect containing the title text.
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// Returns a that contains the title text.
+ CGRect ComputeTitleRect (UIButton platformButton, Button button, UIImage image, double widthConstraint, double heightConstraint, double borderWidth, Thickness padding, bool isMeasuring)
+ {
+ if (string.IsNullOrEmpty(platformButton.CurrentTitle))
+ {
+ return CGRect.Empty;
+ }
+
+ // Use the current TitleLabel if it is set and valid
+ var titleRect = platformButton.TitleLabel.Bounds;
+
+ if ((isMeasuring && _isFirstMeasure) || titleRect.Height == 0 || titleRect.Width == 0)
+ {
+ var titleWidthConstraint = widthConstraint - ((nfloat)borderWidth * 2);
+ var titleHeightConstraint = heightConstraint - ((nfloat)borderWidth * 2);
+
+ if (image is not null && !string.IsNullOrEmpty(platformButton.CurrentTitle) && titleWidthConstraint != double.PositiveInfinity)
+ {
+ // In non-UIButtonConfiguration setups, the title will always be truncated by the image's width
+ // even when the image is on top or bottom.
+ titleWidthConstraint -= image.Size.Width;
+ }
+
+ if (image is not null && button.ContentLayout.Position == ButtonContentLayout.ImagePosition.Left || button.ContentLayout.Position == ButtonContentLayout.ImagePosition.Right)
+ {
+ titleWidthConstraint -= (nfloat)(button.ContentLayout.Spacing + padding.Left + padding.Right);
+ }
+
+ else if (image is null)
+ {
+ titleWidthConstraint -= (nfloat)(padding.Left + padding.Right);
+ }
+
+ titleRect = platformButton.GetTitleBoundingRect(titleWidthConstraint, titleHeightConstraint);
+ }
+
+ // Measure the width of the sample character string using the same font as the TitleLabel. If a character cannot fit in the titleRect, let's use a zero size.
+ var minimumCharacterWidth = new Foundation.NSString("A").GetSizeUsingAttributes(new UIStringAttributes { Font = platformButton.TitleLabel.Font });
+ if (double.IsNaN(titleRect.Width) || double.IsNaN(titleRect.Height) || titleRect.Width < minimumCharacterWidth.Width)
+ {
+ titleRect = Rect.Zero;
+ }
+
+ return titleRect;
+ }
+
+ ///
+ /// See if the button's image fits within the constraints and resize it if necessary.
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ static bool ResizeImageIfNecessary(UIButton platformButton, Button button, UIImage image, Thickness padding, double spacing, double borderWidth, double widthConstraint, double heightConstraint, CGSize originalImageSize)
+ {
+ var currentImageWidth = image.Size.Width;
+ var currentImageHeight = image.Size.Height;
+
+ nfloat availableWidth = (nfloat)widthConstraint;
+ nfloat availableHeight = (nfloat)heightConstraint;
+
+ var additionalHorizontalSpace = (nfloat)padding.Left + (nfloat)padding.Right + ((nfloat)borderWidth * 2);
+ var additionalVerticalSpace = (nfloat)padding.Top + (nfloat)padding.Bottom + ((nfloat)borderWidth * 2);
+
+ if (!string.IsNullOrEmpty(platformButton.CurrentTitle))
+ {
+ if (button.ContentLayout.Position == ButtonContentLayout.ImagePosition.Left || button.ContentLayout.Position == ButtonContentLayout.ImagePosition.Right)
+ {
+ additionalHorizontalSpace += (nfloat)spacing;
+ }
+ else
+ {
+ additionalVerticalSpace += (nfloat)spacing;
+ }
+ }
+
+ // Apply a small buffer to the image size comparison since iOS can return a size that is off by a fraction of a pixel.
+ var buffer = 0.1;
+
+ if (!double.IsNaN(widthConstraint) || !double.IsNaN(heightConstraint))
+ {
+ var contentWidth = (nfloat)widthConstraint - additionalHorizontalSpace;
+
+ if (currentImageWidth - contentWidth > buffer)
+ {
+ availableWidth = contentWidth;
+ }
+
+ var contentHeight = (nfloat)heightConstraint - additionalVerticalSpace;
+ if (currentImageHeight - contentHeight > buffer)
+ {
+ availableHeight = contentHeight;
+ }
+ }
+
+ // make sure we have values greater than 0
+ availableWidth = (nfloat)Math.Max(availableWidth, 0.1f);
+ availableHeight = (nfloat)Math.Max(availableHeight, 0.1f);
+
+ try
+ {
+ // if the image is too large then we will size it smaller
+ if (currentImageHeight - availableHeight > buffer || currentImageWidth - availableWidth > buffer)
+ {
+ image = ResizeImageSource(image, availableWidth, availableHeight, originalImageSize);
+ }
+ // if the image is already sized down but now has more space, we will size it up no more than the original image size
+ else if (availableHeight - additionalVerticalSpace - currentImageHeight > buffer
+ && availableWidth - additionalHorizontalSpace - currentImageWidth > buffer
+ && currentImageHeight != originalImageSize.Height
+ && currentImageWidth != originalImageSize.Width)
+ {
+ image = ResizeImageSource(image, (nfloat)widthConstraint - additionalHorizontalSpace, (nfloat)heightConstraint - additionalVerticalSpace, originalImageSize, true);
+ }
+ else
+ {
+ return false;
+ }
+
+ image = image?.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
+
+ platformButton.SetImage(image, UIControlState.Normal);
+
+ return true;
+ }
+ catch (Exception)
+ {
+ button.Handler.MauiContext?.CreateLogger()?.LogWarning("Can not load Button ImageSource");
+ }
+
+ return false;
+ }
+
+ ///
+ /// Resize the image to fit within the constraints.
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ static UIImage ResizeImageSource(UIImage sourceImage, nfloat maxWidth, nfloat maxHeight, CGSize originalImageSize, bool shouldScaleUp = false)
{
- var result = base.ArrangeOverride(bounds);
- Handler?.UpdateValue(nameof(ContentLayout));
- return result;
+ if (sourceImage is null || sourceImage.CGImage is null)
+ return null;
+
+ maxWidth = (nfloat)Math.Min(maxWidth, originalImageSize.Width);
+ maxHeight = (nfloat)Math.Min(maxHeight, originalImageSize.Height);
+
+ var sourceSize = sourceImage.Size;
+
+ float maxResizeFactor = (float)Math.Min(maxWidth / sourceSize.Width, maxHeight / sourceSize.Height);
+
+ if (maxResizeFactor > 1 && !shouldScaleUp)
+ return sourceImage;
+
+ return UIImage.FromImage(sourceImage.CGImage, sourceImage.CurrentScale / maxResizeFactor, sourceImage.Orientation);
}
public static void MapText(ButtonHandler handler, Button button) =>
@@ -27,12 +459,17 @@ public static void MapLineBreakMode(IButtonHandler handler, Button button)
private static void MapPadding(IButtonHandler handler, Button button)
{
- handler.PlatformView.UpdatePadding(button);
+ handler.PlatformView.UpdateContentLayout(button);
}
public static void MapText(IButtonHandler handler, Button button)
{
handler.PlatformView?.UpdateText(button);
}
+
+ internal static void MapBorderWidth(IButtonHandler handler, Button button)
+ {
+ handler.PlatformView?.UpdateContentLayout(button);
+ }
}
}
diff --git a/src/Controls/src/Core/Platform/iOS/Extensions/ButtonExtensions.cs b/src/Controls/src/Core/Platform/iOS/Extensions/ButtonExtensions.cs
index 1f7d3d80ff5a..dcd896104bf9 100644
--- a/src/Controls/src/Core/Platform/iOS/Extensions/ButtonExtensions.cs
+++ b/src/Controls/src/Core/Platform/iOS/Extensions/ButtonExtensions.cs
@@ -2,6 +2,7 @@
using System;
using CoreGraphics;
using Foundation;
+using Microsoft.Extensions.Logging;
using Microsoft.Maui.Controls.Internals;
using ObjCRuntime;
using UIKit;
@@ -11,19 +12,50 @@ namespace Microsoft.Maui.Controls.Platform
{
public static class ButtonExtensions
{
- static CGRect GetTitleBoundingRect(this UIButton platformButton)
+ ///
+ /// Compute the for the title of the button.
+ ///
+ ///
+ ///
+ ///
+ /// Returns the that contains the button's title.
+ /// The flag is useful for when there is truncation in the title so we will take the max width of the two bounding rects. The GetBoundingRect method does not always give a great representation of what characters will be visible on the button but will not be needed when the UIButton.Configuration API is implemented.
+ internal static CGRect GetTitleBoundingRect(this UIButton platformButton, double widthConstraint, double heightConstraint)
{
- if (platformButton.CurrentAttributedTitle != null ||
- platformButton.CurrentTitle != null)
+ if ((platformButton.CurrentAttributedTitle != null || platformButton.CurrentTitle != null)
+ && widthConstraint > 0 && heightConstraint > 0)
{
var title =
platformButton.CurrentAttributedTitle ??
new NSAttributedString(platformButton.CurrentTitle, new UIStringAttributes { Font = platformButton.TitleLabel.Font });
- return title.GetBoundingRect(
- platformButton.Bounds.Size,
+ // Use the available height when calculating the bounding rect
+ var lineHeight = platformButton.TitleLabel.Font.LineHeight;
+ var availableHeight = heightConstraint;
+
+ // If the line break mode is one of the truncation modes, limit the height to the line height
+ if (platformButton.TitleLabel.LineBreakMode == UILineBreakMode.HeadTruncation ||
+ platformButton.TitleLabel.LineBreakMode == UILineBreakMode.MiddleTruncation ||
+ platformButton.TitleLabel.LineBreakMode == UILineBreakMode.TailTruncation ||
+ platformButton.TitleLabel.LineBreakMode == UILineBreakMode.Clip)
+ {
+ availableHeight = Math.Min(lineHeight, heightConstraint);
+ }
+
+ var availableSize = new CGSize(widthConstraint, availableHeight);
+
+ var boundingRect = title.GetBoundingRect(
+ availableSize,
NSStringDrawingOptions.UsesLineFragmentOrigin | NSStringDrawingOptions.UsesFontLeading,
null);
+
+ // The width is more usually more accurate when using the device metrics with truncatated text
+ var boundingRectWithDeviceMetrics = title.GetBoundingRect(
+ availableSize,
+ NSStringDrawingOptions.UsesLineFragmentOrigin | NSStringDrawingOptions.UsesFontLeading | NSStringDrawingOptions.UsesDeviceMetrics,
+ null);
+
+ return new CGRect(boundingRectWithDeviceMetrics.Location, new CGSize(Math.Max(boundingRect.Width, boundingRectWithDeviceMetrics.Width), Math.Min(availableHeight, boundingRect.Height)));
}
return CGRect.Empty;
@@ -31,166 +63,21 @@ static CGRect GetTitleBoundingRect(this UIButton platformButton)
public static void UpdatePadding(this UIButton platformButton, Button button)
{
- double spacingVertical = 0;
- double spacingHorizontal = 0;
-
- if (button.ImageSource != null)
- {
- if (button.ContentLayout.IsHorizontal())
- {
- spacingHorizontal = button.ContentLayout.Spacing;
- }
- else
- {
- var imageHeight = platformButton.ImageView.Image?.Size.Height ?? 0f;
-
- if (imageHeight < platformButton.Bounds.Height)
- {
- spacingVertical = button.ContentLayout.Spacing +
- platformButton.GetTitleBoundingRect().Height;
- }
-
- }
- }
-
var padding = button.Padding;
if (padding.IsNaN)
padding = ButtonHandler.DefaultPadding;
- padding += new Thickness(spacingHorizontal / 2, spacingVertical / 2);
-
platformButton.UpdatePadding(padding);
}
- public static void UpdateContentLayout(this UIButton platformButton, Button button)
+ internal static void UpdateContentEdgeInsets(this UIButton platformButton, Button button, Thickness thickness)
{
- if (platformButton.Bounds.Width == 0)
- {
- return;
- }
-
- var imageInsets = new UIEdgeInsets();
- var titleInsets = new UIEdgeInsets();
-
- var layout = button.ContentLayout;
- var spacing = (nfloat)layout.Spacing;
-
- var image = platformButton.CurrentImage;
-
-
- // if the image is too large then we just position at the edge of the button
- // depending on the position the user has picked
- // This makes the behavior consistent with android
- var contentMode = UIViewContentMode.Center;
-
- if (image != null && !string.IsNullOrEmpty(platformButton.CurrentTitle))
- {
- // TODO: Do not use the title label as it is not yet updated and
- // if we move the image, then we technically have more
- // space and will require a new layout pass.
-
- var titleRect = platformButton.GetTitleBoundingRect();
- var titleWidth = titleRect.Width;
- var titleHeight = titleRect.Height;
- var imageWidth = image.Size.Width;
- var imageHeight = image.Size.Height;
- var buttonWidth = platformButton.Bounds.Width;
- var buttonHeight = platformButton.Bounds.Height;
- var sharedSpacing = spacing / 2;
-
- // These are just used to shift the image and title to center
- // Which makes the later math easier to follow
- imageInsets.Left += titleWidth / 2;
- imageInsets.Right -= titleWidth / 2;
- titleInsets.Left -= imageWidth / 2;
- titleInsets.Right += imageWidth / 2;
-
- if (layout.Position == ButtonContentLayout.ImagePosition.Top)
- {
- if (imageHeight > buttonHeight)
- {
- contentMode = UIViewContentMode.Top;
- }
- else
- {
- imageInsets.Top -= (titleHeight / 2) + sharedSpacing;
- imageInsets.Bottom += titleHeight / 2;
-
- titleInsets.Top += imageHeight / 2;
- titleInsets.Bottom -= (imageHeight / 2) + sharedSpacing;
- }
- }
- else if (layout.Position == ButtonContentLayout.ImagePosition.Bottom)
- {
- if (imageHeight > buttonHeight)
- {
- contentMode = UIViewContentMode.Bottom;
- }
- else
- {
- imageInsets.Top += titleHeight / 2;
- imageInsets.Bottom -= (titleHeight / 2) + sharedSpacing;
- }
-
- titleInsets.Top -= (imageHeight / 2) + sharedSpacing;
- titleInsets.Bottom += imageHeight / 2;
- }
- else if (layout.Position == ButtonContentLayout.ImagePosition.Left)
- {
- if (imageWidth > buttonWidth)
- {
- contentMode = UIViewContentMode.Left;
- }
- else
- {
- imageInsets.Left -= (titleWidth / 2) + sharedSpacing;
- imageInsets.Right += titleWidth / 2;
- }
-
- titleInsets.Left += imageWidth / 2;
- titleInsets.Right -= (imageWidth / 2) + sharedSpacing;
- }
- else if (layout.Position == ButtonContentLayout.ImagePosition.Right)
- {
- if (imageWidth > buttonWidth)
- {
- contentMode = UIViewContentMode.Right;
- }
- else
- {
- imageInsets.Left += titleWidth / 2;
- imageInsets.Right -= (titleWidth / 2) + sharedSpacing;
- }
-
- titleInsets.Left -= (imageWidth / 2) + sharedSpacing;
- titleInsets.Right += imageWidth / 2;
- }
- }
-
- platformButton.ImageView.ContentMode = contentMode;
-
- // This is used to match the behavior between platforms.
- // If the image is too big then we just hide the label because
- // the image is pushing the title out of the visible view.
- // We can't use insets because then the title shows up outside the
- // bounds of the UIButton. We could set the UIButton to clip bounds
- // but that feels like it might cause confusing side effects
- if (contentMode == UIViewContentMode.Center)
- platformButton.TitleLabel.Layer.Hidden = false;
- else
- platformButton.TitleLabel.Layer.Hidden = true;
-
- platformButton.UpdatePadding(button);
+ platformButton.UpdateContentEdgeInsets(thickness);
+ }
-#pragma warning disable CA1416, CA1422 // TODO: [UnsupportedOSPlatform("ios15.0")]
- if (platformButton.ImageEdgeInsets != imageInsets ||
- platformButton.TitleEdgeInsets != titleInsets)
- {
- platformButton.ImageEdgeInsets = imageInsets;
- platformButton.TitleEdgeInsets = titleInsets;
- platformButton.GetSuperViewIfWindowSet()?.SetNeedsLayout();
- }
-#pragma warning restore CA1416, CA1422
+ public static void UpdateContentLayout(this UIButton platformButton, Button button)
+ {
+ (button as IView)?.InvalidateMeasure();
}
public static void UpdateText(this UIButton platformButton, Button button)
@@ -217,4 +104,4 @@ public static void UpdateLineBreakMode(this UIButton nativeButton, Button button
};
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index ec30a83003c7..062dd05a8803 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -99,6 +99,7 @@ virtual Microsoft.Maui.Controls.DragEventArgs.GetPosition(Microsoft.Maui.Control
virtual Microsoft.Maui.Controls.DragStartingEventArgs.GetPosition(Microsoft.Maui.Controls.Element? relativeTo) -> Microsoft.Maui.Graphics.Point?
virtual Microsoft.Maui.Controls.DropEventArgs.GetPosition(Microsoft.Maui.Controls.Element? relativeTo) -> Microsoft.Maui.Graphics.Point?
*REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*override Microsoft.Maui.Controls.Button.ArrangeOverride(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
Microsoft.Maui.Controls.Border.~Border() -> void
Microsoft.Maui.Controls.IWindowCreator
Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index c77202070fd5..28ea0c9dd7fd 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -98,6 +98,7 @@ virtual Microsoft.Maui.Controls.DragEventArgs.GetPosition(Microsoft.Maui.Control
virtual Microsoft.Maui.Controls.DragStartingEventArgs.GetPosition(Microsoft.Maui.Controls.Element? relativeTo) -> Microsoft.Maui.Graphics.Point?
virtual Microsoft.Maui.Controls.DropEventArgs.GetPosition(Microsoft.Maui.Controls.Element? relativeTo) -> Microsoft.Maui.Graphics.Point?
*REMOVED*override Microsoft.Maui.Controls.RefreshView.MeasureOverride(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
+*REMOVED*override Microsoft.Maui.Controls.Button.ArrangeOverride(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
Microsoft.Maui.Controls.Border.~Border() -> void
Microsoft.Maui.Controls.IWindowCreator
Microsoft.Maui.Controls.IWindowCreator.CreateWindow(Microsoft.Maui.Controls.Application! app, Microsoft.Maui.IActivationState? activationState) -> Microsoft.Maui.Controls.Window!
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderWidthAffectsTheImageSizingBorderWidth.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderWidthAffectsTheImageSizingBorderWidth.png
new file mode 100644
index 000000000000..d65988e128c8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderWidthAffectsTheImageSizingBorderWidth.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderWidthAffectsTheImageSizingOriginal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderWidthAffectsTheImageSizingOriginal.png
new file mode 100644
index 000000000000..1920b6508f2b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderWidthAffectsTheImageSizingOriginal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonLayoutResizesWithImagePositionBottom.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonLayoutResizesWithImagePositionBottom.png
new file mode 100644
index 000000000000..20bc18b52cbc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonLayoutResizesWithImagePositionBottom.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonLayoutResizesWithImagePositionLeft.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonLayoutResizesWithImagePositionLeft.png
new file mode 100644
index 000000000000..147964621958
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonLayoutResizesWithImagePositionLeft.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonLayoutResizesWithImagePositionRight.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonLayoutResizesWithImagePositionRight.png
new file mode 100644
index 000000000000..58c36b498f53
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonLayoutResizesWithImagePositionRight.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonLayoutResizesWithImagePositionTop.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonLayoutResizesWithImagePositionTop.png
new file mode 100644
index 000000000000..0e9912fff294
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonLayoutResizesWithImagePositionTop.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png
new file mode 100644
index 000000000000..4428cf1b1e63
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal2.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal2.png
new file mode 100644
index 000000000000..769d4fba681b
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesOriginal2.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownLandscape.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownLandscape.png
new file mode 100644
index 000000000000..92c578f6f111
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownLandscape.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png
new file mode 100644
index 000000000000..711fa530c132
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_BorderWidth.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_BorderWidth.png
index 89663721fc12..94fa27913462 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_BorderWidth.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ImageButtonUITests_BorderWidth.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage1_Border.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage1_Border.png
new file mode 100644
index 000000000000..07a414b7c0a8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage1_Border.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage1_NoBorder.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage1_NoBorder.png
new file mode 100644
index 000000000000..3f34c39ad6c2
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage1_NoBorder.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage2.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage2.png
new file mode 100644
index 000000000000..36fe53a0b70f
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage2.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage3.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage3.png
new file mode 100644
index 000000000000..12a7bbef3be8
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage3.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage4.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage4.png
new file mode 100644
index 000000000000..dd1743f0b1aa
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage4.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage5.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage5.png
new file mode 100644
index 000000000000..2306443c16eb
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage5.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage6.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage6.png
new file mode 100644
index 000000000000..47cd1eda667c
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage6.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage7.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage7.png
new file mode 100644
index 000000000000..ebaf48c9e160
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage7.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage8_Center.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage8_Center.png
new file mode 100644
index 000000000000..e76ba8b209fc
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage8_Center.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage8_End.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage8_End.png
new file mode 100644
index 000000000000..a01a35136b91
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage8_End.png differ
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage8_Start.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage8_Start.png
new file mode 100644
index 000000000000..7ec0f3ec7a53
Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyButtonPage8_Start.png differ
diff --git a/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj b/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj
index 58d2c6ca3ed9..91157419d2ca 100644
--- a/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj
+++ b/src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj
@@ -46,6 +46,7 @@
+
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22306.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306.xaml
new file mode 100644
index 000000000000..6ae3c2fac3bd
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306.xaml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22306.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306.xaml.cs
new file mode 100644
index 000000000000..c17ca26e8a25
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues
+{
+ [XamlCompilation(XamlCompilationOptions.Compile)]
+ [Issue(IssueTracker.Github, 22306, "Resizing buttons' parents resolves layout", PlatformAffected.iOS)]
+ public partial class Issue22306 : ContentPage
+ {
+ bool shouldSizeDown = false;
+
+ public Issue22306()
+ {
+ InitializeComponent();
+ }
+
+ void ChangeBoundsPressed(object sender, EventArgs e)
+ {
+ shouldSizeDown = !shouldSizeDown;
+
+ RowAbove.Height = new GridLength(shouldSizeDown ? 3 : 1, GridUnitType.Star);
+ RowBelow.Height = new GridLength(shouldSizeDown ? 3 : 1, GridUnitType.Star);
+ ColumnBefore.Width = new GridLength(shouldSizeDown ? 3 : 1, GridUnitType.Star);
+ ColumnAfter.Width = new GridLength(shouldSizeDown ? 3 : 1, GridUnitType.Star);
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22306_2.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306_2.xaml
new file mode 100644
index 000000000000..1b321d47cb2c
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306_2.xaml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22306_2.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306_2.xaml.cs
new file mode 100644
index 000000000000..8b56dcb462ff
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306_2.xaml.cs
@@ -0,0 +1,26 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues
+{
+ [XamlCompilation(XamlCompilationOptions.Compile)]
+ [Issue(IssueTracker.Github, 22306_2, "Button sizes content with respect to the BorderWidth", PlatformAffected.iOS)]
+ public partial class Issue22306_2 : ContentPage
+ {
+ bool toggleBorderWidth = false;
+
+ public Issue22306_2()
+ {
+ InitializeComponent();
+ }
+
+ void Change_BorderWidth_Button_Clicked (object sender, System.EventArgs e)
+ {
+ toggleBorderWidth = !toggleBorderWidth;
+
+ TextButton.BorderWidth = toggleBorderWidth ? 5 : 0;
+ ImageButton.BorderWidth = toggleBorderWidth ? 20 : 0;
+ TextImageButton.BorderWidth = toggleBorderWidth ? 20 : 0;
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22306_3.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306_3.xaml
new file mode 100644
index 000000000000..ae401f9b051e
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306_3.xaml
@@ -0,0 +1,325 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22306_3.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306_3.xaml.cs
new file mode 100644
index 000000000000..0fc13b66ad4b
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22306_3.xaml.cs
@@ -0,0 +1,191 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+[Issue(IssueTracker.Github, 22306_3, "Verify many different button examples", PlatformAffected.iOS)]
+public partial class Issue22306_3 : ContentPage
+{
+ public Issue22306_3()
+ {
+ InitializeComponent();
+ }
+
+ void Button1_Pressed (object sender, System.EventArgs e)
+ {
+ ClearAll();
+ Page1_1.IsVisible = true;
+ Page1_2Button.IsVisible = true;
+ Page1_3.IsVisible = true;
+ Page1_4.IsVisible = true;
+ }
+
+ void Button2_Pressed (object sender, System.EventArgs e)
+ {
+ ClearAll();
+ Page2_1.IsVisible = true;
+ Page2_2.IsVisible = true;
+ Page2_3.IsVisible = true;
+ }
+
+ void Button3_Pressed (object sender, System.EventArgs e)
+ {
+ ClearAll();
+ Page3_1.IsVisible = true;
+ Page3_2.IsVisible = true;
+ Page3_3.IsVisible = true;
+ Page3_4.IsVisible = true;
+ Page3_5.IsVisible = true;
+ Page3_6.IsVisible = true;
+ Page3_7.IsVisible = true;
+ Page3_8.IsVisible = true;
+ }
+
+ void Button4_Pressed (object sender, System.EventArgs e)
+ {
+ ClearAll();
+ Page4_1.IsVisible = true;
+ Page4_2.IsVisible = true;
+ Page4_3.IsVisible = true;
+ Page4_4.IsVisible = true;
+ Page4_5.IsVisible = true;
+ }
+
+ void Button5_Pressed (object sender, System.EventArgs e)
+ {
+ ClearAll();
+ Page5_1.IsVisible = true;
+ Page5_2.IsVisible = true;
+ Page5_3.IsVisible = true;
+ }
+
+ void Button6_Pressed (object sender, System.EventArgs e)
+ {
+ ClearAll();
+ Page6_1.IsVisible = true;
+ Page6_2.IsVisible = true;
+ Page6_3.IsVisible = true;
+ }
+
+ void Button7_Pressed (object sender, System.EventArgs e)
+ {
+ ClearAll();
+ Page7_1.IsVisible = true;
+ Page7_2.IsVisible = true;
+ Page7_3.IsVisible = true;
+ }
+
+ void Button8_Pressed (object sender, System.EventArgs e)
+ {
+ ClearAll();
+ Page8_1.IsVisible = true;
+ Page8_2.IsVisible = true;
+ Page8_3.IsVisible = true;
+ Page8_4.IsVisible = true;
+ Page8_5.IsVisible = true;
+ Page8_6Button.IsVisible = true;
+ Page8_7Button.IsVisible = true;
+ }
+
+ void ClearAll ()
+ {
+ Page1_1.IsVisible = false;
+ Page1_2Button.IsVisible = false;
+ Page1_3.IsVisible = false;
+ Page1_4.IsVisible = false;
+ Page2_1.IsVisible = false;
+ Page2_2.IsVisible = false;
+ Page2_3.IsVisible = false;
+ Page3_1.IsVisible = false;
+ Page3_2.IsVisible = false;
+ Page3_3.IsVisible = false;
+ Page3_4.IsVisible = false;
+ Page3_5.IsVisible = false;
+ Page3_6.IsVisible = false;
+ Page3_7.IsVisible = false;
+ Page3_8.IsVisible = false;
+ Page4_1.IsVisible = false;
+ Page4_2.IsVisible = false;
+ Page4_3.IsVisible = false;
+ Page4_4.IsVisible = false;
+ Page4_5.IsVisible = false;
+ Page5_1.IsVisible = false;
+ Page5_2.IsVisible = false;
+ Page5_3.IsVisible = false;
+ Page6_1.IsVisible = false;
+ Page6_2.IsVisible = false;
+ Page6_3.IsVisible = false;
+ Page7_1.IsVisible = false;
+ Page7_2.IsVisible = false;
+ Page7_3.IsVisible = false;
+ Page8_1.IsVisible = false;
+ Page8_2.IsVisible = false;
+ Page8_3.IsVisible = false;
+ Page8_4.IsVisible = false;
+ Page8_5.IsVisible = false;
+ Page8_6Button.IsVisible = false;
+ Page8_7Button.IsVisible = false;
+ }
+
+ void Page1_2Button_Pressed (object sender, System.EventArgs e)
+ {
+ Page1_1.BorderWidth = 75;
+ }
+
+ async void ScrollToMiddlePressed (object sender, System.EventArgs e)
+ {
+ var scroll1 = Page8_1 as ScrollView;
+ var scroll2 = Page8_3 as ScrollView;
+ var scroll3 = Page8_5 as ScrollView;
+
+ if (scroll1 != null)
+ {
+ var contentWidth1 = scroll1.ContentSize.Width;
+ var scrollViewWidth1 = scroll1.Width;
+ var scrollPosition1 = (contentWidth1 - scrollViewWidth1) / 2;
+ await scroll1.ScrollToAsync(scrollPosition1, 0, false);
+ }
+
+ if (scroll2 != null)
+ {
+ var contentWidth2 = scroll2.ContentSize.Width;
+ var scrollViewWidth2 = scroll2.Width;
+ var scrollPosition2 = (contentWidth2 - scrollViewWidth2) / 2;
+ await scroll2.ScrollToAsync(scrollPosition2, 0, false);
+ }
+
+ if (scroll3 != null)
+ {
+ var contentWidth3 = scroll3.ContentSize.Width;
+ var scrollViewWidth3 = scroll3.Width;
+ var scrollPosition3 = (contentWidth3 - scrollViewWidth3) / 2;
+ await scroll3.ScrollToAsync(scrollPosition3, 0, false);
+ }
+ }
+
+ async void ScrollToEndPressed(object sender, System.EventArgs e)
+ {
+ var scroll1 = Page8_1 as ScrollView;
+ var scroll2 = Page8_3 as ScrollView;
+ var scroll3 = Page8_5 as ScrollView;
+
+ if (scroll1 != null)
+ {
+ var contentWidth1 = scroll1.ContentSize.Width;
+ await scroll1.ScrollToAsync(contentWidth1, 0, false);
+ }
+
+ if (scroll2 != null)
+ {
+ var contentWidth2 = scroll2.ContentSize.Width;
+ await scroll2.ScrollToAsync(contentWidth2, 0, false);
+ }
+
+ if (scroll3 != null)
+ {
+ var contentWidth3 = scroll3.ContentSize.Width;
+ await scroll3.ScrollToAsync(contentWidth3, 0, false);
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issues22306_1.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issues22306_1.xaml
new file mode 100644
index 000000000000..9c3bff247734
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issues22306_1.xaml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issues22306_1.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issues22306_1.xaml.cs
new file mode 100644
index 000000000000..c17f4c6d7b78
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issues22306_1.xaml.cs
@@ -0,0 +1,28 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues
+{
+ [XamlCompilation(XamlCompilationOptions.Compile)]
+ [Issue(IssueTracker.Github, 22306_1, "Button with images measures correctly", PlatformAffected.iOS)]
+ public partial class Issues22306_1 : ContentPage
+ {
+ public Issues22306_1()
+ {
+ InitializeComponent();
+ }
+
+ void RotateButton_Clicked(object sender, System.EventArgs e)
+ {
+ var button = (Button)sender;
+ var newPosition = ((int)button.ContentLayout.Position + 1) % 4;
+
+ var contentLayout =
+ new Button.ButtonContentLayout((Button.ButtonContentLayout.ImagePosition)newPosition,
+ button.ContentLayout.Spacing);
+
+ button.ContentLayout = contentLayout;
+ ConstrainedButton.ContentLayout = contentLayout;
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Resources/Images/dotnet_bot_resized2.svg b/src/Controls/tests/TestCases.HostApp/Resources/Images/dotnet_bot_resized2.svg
new file mode 100644
index 000000000000..270cce017b85
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Resources/Images/dotnet_bot_resized2.svg
@@ -0,0 +1,694 @@
+
+
+
+
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22306.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22306.cs
new file mode 100644
index 000000000000..6e4229a731f7
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22306.cs
@@ -0,0 +1,60 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+ public class Issue22306 : _IssuesUITest
+ {
+ public Issue22306(TestDevice device) : base(device) { }
+
+ public override string Issue => "Resizing buttons' parents resolves layout";
+
+ [Test]
+ [Category(UITestCategories.Button)]
+ public void ButtonsLayoutResolveWhenParentSizeChanges()
+ {
+#if IOS || ANDROID
+ try
+ {
+ App.SetOrientationPortrait();
+#endif
+ WaitForAllElements();
+ var changeBoundsButton = App.WaitForElement("ChangeBoundsButton");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "Original");
+
+ changeBoundsButton.Click();
+
+ WaitForAllElements();
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "SizeButtonsDownPortrait");
+
+#if IOS || ANDROID
+ App.SetOrientationLandscape();
+
+ WaitForAllElements();
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "SizeButtonsDownLandscape");
+ changeBoundsButton.Click();
+ WaitForAllElements();
+
+ App.SetOrientationPortrait();
+ WaitForAllElements();
+ // Cannot use the original screenshot as the black bar on bottom is not as dark after rotation
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "Original2");
+ }
+ finally
+ {
+ App.SetOrientationPortrait();
+ }
+#endif
+ }
+
+ void WaitForAllElements()
+ {
+ App.WaitForElement("ButtonLeft");
+ App.WaitForElement("ButtonTop");
+ App.WaitForElement("ButtonRight");
+ App.WaitForElement("ButtonBottom");
+ App.WaitForElement("ChangeBoundsButton");
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22306_1.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22306_1.cs
new file mode 100644
index 000000000000..5a492efaf774
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22306_1.cs
@@ -0,0 +1,45 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+ public class Issue22306_1 : _IssuesUITest
+ {
+ public Issue22306_1(TestDevice device) : base(device) { }
+
+ public override string Issue => "Button with images measures correctly";
+
+ [Test]
+ [Category(UITestCategories.Button)]
+ public async Task ButtonMeasuresLargerThanDefault()
+ {
+ // seems possible in CI that the iOS Button is not laid out before the height evaluation
+ await Task.Delay(100);
+ var rotateButtonRect = App.WaitForElement("RotateButton").GetRect();
+ var button3Rect = App.WaitForElement("Button3").GetRect();
+
+ Assert.That(rotateButtonRect.Height > button3Rect.Height, $"rotateButtonRect.Height is {rotateButtonRect.Height} is not greater than button3Rect.Height {button3Rect.Height}");
+ }
+
+ [Test]
+ [Category(UITestCategories.Button)]
+ public void ButtonLayoutResizesWithImagePosition()
+ {
+ App.WaitForElement("RotateButton");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "Top");
+
+ App.WaitForElement("RotateButton").Tap();
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "Right");
+
+ App.WaitForElement("RotateButton").Tap();
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "Bottom");
+
+ App.WaitForElement("RotateButton").Tap();
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "Left");
+
+ App.WaitForElement("RotateButton").Tap();
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "Top");
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22306_2.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22306_2.cs
new file mode 100644
index 000000000000..8ce3c631f1a7
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22306_2.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+ public class Issue22306_2 : _IssuesUITest
+ {
+ public Issue22306_2(TestDevice device) : base(device) { }
+
+ public override string Issue => "Button sizes content with respect to the BorderWidth";
+
+ [Test]
+ [Category(UITestCategories.Button)]
+ public void BorderWidthAffectsTheImageSizing()
+ {
+ App.WaitForElement("Change_BorderWidth_Button");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "Original");
+ App.Tap("Change_BorderWidth_Button");
+
+ App.WaitForElement("Change_BorderWidth_Button");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "BorderWidth");
+ App.Tap("Change_BorderWidth_Button");
+
+ App.WaitForElement("Change_BorderWidth_Button");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "Original");
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22306_3.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22306_3.cs
new file mode 100644
index 000000000000..5867e46eb23a
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22306_3.cs
@@ -0,0 +1,105 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+ public class Issue22306_3 : _IssuesUITest
+ {
+ public Issue22306_3(TestDevice device) : base(device) { }
+
+ public override string Issue => "Verify many different button examples";
+
+ [Test]
+ [Category(UITestCategories.Button)]
+ public void VerifyButtonPage1()
+ {
+ App.WaitForElement("Page1Button");
+ App.Tap("Page1Button");
+ App.WaitForElement("Page1_1");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "_NoBorder");
+
+ App.Tap("Page1_2Button");
+ App.WaitForElement("Page1_1");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "_Border");
+ }
+
+ [Test]
+ [Category(UITestCategories.Button)]
+ public void VerifyButtonPage2()
+ {
+ App.WaitForElement("Page2Button");
+ App.Tap("Page2Button");
+ App.WaitForElement("Page2_1");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName);
+ }
+
+ [Test]
+ [Category(UITestCategories.Button)]
+ public void VerifyButtonPage3()
+ {
+ App.WaitForElement("Page3Button");
+ App.Tap("Page3Button");
+ App.WaitForElement("Page3_1");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName);
+ }
+
+ [Test]
+ [Category(UITestCategories.Button)]
+ public void VerifyButtonPage4()
+ {
+ App.WaitForElement("Page4Button");
+ App.Tap("Page4Button");
+ App.WaitForElement("Page4_1");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName);
+ }
+
+ [Test]
+ [Category(UITestCategories.Button)]
+ public void VerifyButtonPage5()
+ {
+ App.WaitForElement("Page5Button");
+ App.Tap("Page5Button");
+ App.WaitForElement("Page5_1");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName);
+ }
+
+ [Test]
+ [Category(UITestCategories.Button)]
+ public void VerifyButtonPage6()
+ {
+ App.WaitForElement("Page6Button");
+ App.Tap("Page6Button");
+ App.WaitForElement("Page6_1");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName);
+ }
+
+ [Test]
+ [Category(UITestCategories.Button)]
+ public void VerifyButtonPage7()
+ {
+ App.WaitForElement("Page7Button");
+ App.Tap("Page7Button");
+ App.WaitForElement("Page7_1");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName);
+ }
+
+ [Test]
+ [Category(UITestCategories.Button)]
+ public void VerifyButtonPage8()
+ {
+ App.WaitForElement("Page8Button");
+ App.Tap("Page8Button");
+ App.WaitForElement("Page8_1");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "_Start");
+
+ App.Tap("Page8_6Button");
+ App.WaitForElement("Page8_1");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "_Center");
+
+ App.Tap("Page8_7Button");
+ App.WaitForElement("Page8_1");
+ VerifyScreenshot(TestContext.CurrentContext.Test.MethodName + "_End");
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderWidthAffectsTheImageSizingBorderWidth.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderWidthAffectsTheImageSizingBorderWidth.png
new file mode 100644
index 000000000000..d36cc05e767e
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderWidthAffectsTheImageSizingBorderWidth.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderWidthAffectsTheImageSizingOriginal.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderWidthAffectsTheImageSizingOriginal.png
new file mode 100644
index 000000000000..e6b2d4186c58
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderWidthAffectsTheImageSizingOriginal.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonLayoutResizesWithImagePositionBottom.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonLayoutResizesWithImagePositionBottom.png
new file mode 100644
index 000000000000..6ecfc165110c
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonLayoutResizesWithImagePositionBottom.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonLayoutResizesWithImagePositionLeft.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonLayoutResizesWithImagePositionLeft.png
new file mode 100644
index 000000000000..feb5af93fdbf
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonLayoutResizesWithImagePositionLeft.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonLayoutResizesWithImagePositionRight.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonLayoutResizesWithImagePositionRight.png
new file mode 100644
index 000000000000..a61219b3f0d5
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonLayoutResizesWithImagePositionRight.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonLayoutResizesWithImagePositionTop.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonLayoutResizesWithImagePositionTop.png
new file mode 100644
index 000000000000..904f0a1c713b
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonLayoutResizesWithImagePositionTop.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png
new file mode 100644
index 000000000000..7beb07375483
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png
new file mode 100644
index 000000000000..0dc14fee6a57
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage1_Border.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage1_Border.png
new file mode 100644
index 000000000000..6b7375e23742
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage1_Border.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage1_NoBorder.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage1_NoBorder.png
new file mode 100644
index 000000000000..21b3e1b7cab2
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage1_NoBorder.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage2.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage2.png
new file mode 100644
index 000000000000..c820c173f7c3
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage2.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage3.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage3.png
new file mode 100644
index 000000000000..7d6c0f1e2096
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage3.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage4.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage4.png
new file mode 100644
index 000000000000..76cbf9924fb5
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage4.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage5.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage5.png
new file mode 100644
index 000000000000..2e2b751f014e
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage5.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage6.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage6.png
new file mode 100644
index 000000000000..89471854972e
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage6.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage7.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage7.png
new file mode 100644
index 000000000000..3ed95f8e58c8
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage7.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage8_Center.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage8_Center.png
new file mode 100644
index 000000000000..4773e81159d2
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage8_Center.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage8_End.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage8_End.png
new file mode 100644
index 000000000000..240e438e3eab
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage8_End.png differ
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage8_Start.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage8_Start.png
new file mode 100644
index 000000000000..64c996ae3566
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyButtonPage8_Start.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderBackgroundSizeUpdatesWhenRotatingScreen.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderBackgroundSizeUpdatesWhenRotatingScreen.png
index ade193be1acb..6e6e36c04b49 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderBackgroundSizeUpdatesWhenRotatingScreen.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderBackgroundSizeUpdatesWhenRotatingScreen.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWidthAffectsTheImageSizingBorderWidth.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWidthAffectsTheImageSizingBorderWidth.png
new file mode 100644
index 000000000000..1b967ad6a430
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWidthAffectsTheImageSizingBorderWidth.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWidthAffectsTheImageSizingOriginal.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWidthAffectsTheImageSizingOriginal.png
new file mode 100644
index 000000000000..c935958b8dda
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderWidthAffectsTheImageSizingOriginal.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionBottom.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionBottom.png
new file mode 100644
index 000000000000..3ffbce34a47d
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionBottom.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionLeft.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionLeft.png
new file mode 100644
index 000000000000..547554c81679
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionLeft.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionRight.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionRight.png
new file mode 100644
index 000000000000..4a9174746912
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionRight.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionTop.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionTop.png
new file mode 100644
index 000000000000..749b1826d9d2
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonLayoutResizesWithImagePositionTop.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png
new file mode 100644
index 000000000000..e3320c5f78c1
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesOriginal.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesOriginal2.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesOriginal2.png
new file mode 100644
index 000000000000..b73a73d3b3d3
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesOriginal2.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownLandscape.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownLandscape.png
new file mode 100644
index 000000000000..38ec936a4631
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownLandscape.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png
new file mode 100644
index 000000000000..eacdc71d0ffe
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ButtonsLayoutResolveWhenParentSizeChangesSizeButtonsDownPortrait.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Default.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Default.png
index 22f3a42d8d52..981edb37bf05 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Default.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Default.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Layout.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Layout.png
index 91c847d899df..1c022a637642 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Layout.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Layout.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Spacing.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Spacing.png
index e9c7e9d8934f..e90dd2a0932b 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Spacing.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue22433_Spacing.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage1_Border.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage1_Border.png
new file mode 100644
index 000000000000..9112ac47a599
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage1_Border.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage1_NoBorder.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage1_NoBorder.png
new file mode 100644
index 000000000000..24591a906ddf
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage1_NoBorder.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage2.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage2.png
new file mode 100644
index 000000000000..93aab5981313
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage2.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage3.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage3.png
new file mode 100644
index 000000000000..6e93ad55ab34
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage3.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage4.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage4.png
new file mode 100644
index 000000000000..d7e8f0345db2
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage4.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage5.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage5.png
new file mode 100644
index 000000000000..2ffc0d850a9b
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage5.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage6.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage6.png
new file mode 100644
index 000000000000..833b89fee156
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage6.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage7.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage7.png
new file mode 100644
index 000000000000..eb9a242ddba0
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage7.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage8_Center.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage8_Center.png
new file mode 100644
index 000000000000..b281ef5138ce
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage8_Center.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage8_End.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage8_End.png
new file mode 100644
index 000000000000..2796a62b6759
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage8_End.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage8_Start.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage8_Start.png
new file mode 100644
index 000000000000..b53ad7bdb1a1
Binary files /dev/null and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyButtonPage8_Start.png differ
diff --git a/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs b/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
index 100047eff21d..252eaf2f573a 100644
--- a/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
+++ b/src/Core/src/Handlers/Button/ButtonHandler.iOS.cs
@@ -25,6 +25,15 @@ protected override UIButton CreatePlatformView()
readonly ButtonEventProxy _proxy = new ButtonEventProxy();
+ protected override void SetupContainer()
+ {
+ base.SetupContainer();
+ if (ContainerView is WrapperView wrapperView)
+ {
+ wrapperView.CrossPlatformLayout = VirtualView as ICrossPlatformLayout;
+ }
+ }
+
protected override void ConnectHandler(UIButton platformView)
{
_proxy.Connect(VirtualView, platformView);
diff --git a/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs b/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs
index 4e91cbd5242f..1bfd7349c9ac 100644
--- a/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs
+++ b/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs
@@ -89,6 +89,10 @@ internal static Size GetDesiredSizeFromHandler(this IViewHandler viewHandler, do
sizeThatFits = imageView.SizeThatFitsImage(new CGSize((float)widthConstraint, (float)heightConstraint));
}
+ else if (platformView is WrapperView wrapper)
+ {
+ sizeThatFits = wrapper.SizeThatFitsWrapper(new CGSize((float)widthConstraint, (float)heightConstraint), virtualView.Width, virtualView.Height, virtualView);
+ }
else if (platformView is UIButton imageButton && imageButton.ImageView?.Image is not null && imageButton.CurrentTitle is null)
{
widthConstraint = IsExplicitSet(virtualView.Width) ? virtualView.Width : widthConstraint;
@@ -96,10 +100,6 @@ internal static Size GetDesiredSizeFromHandler(this IViewHandler viewHandler, do
sizeThatFits = imageButton.ImageView.SizeThatFitsImage(new CGSize((float)widthConstraint, (float)heightConstraint));
}
- else if (platformView is WrapperView wrapper)
- {
- sizeThatFits = wrapper.SizeThatFitsWrapper(new CGSize((float)widthConstraint, (float)heightConstraint), virtualView.Width, virtualView.Height);
- }
else
{
sizeThatFits = platformView.SizeThatFits(new CGSize((float)widthConstraint, (float)heightConstraint));
diff --git a/src/Core/src/Platform/iOS/ButtonExtensions.cs b/src/Core/src/Platform/iOS/ButtonExtensions.cs
index 14134c294743..8a92700fed8e 100644
--- a/src/Core/src/Platform/iOS/ButtonExtensions.cs
+++ b/src/Core/src/Platform/iOS/ButtonExtensions.cs
@@ -73,6 +73,32 @@ public static void UpdatePadding(this UIButton platformButton, Thickness padding
if (bottom == 0.0)
bottom = AlmostZero;
+ // The downside of using the ContentEdgeInsets is that in non-UIButtonConfiguration instances, it will truncate the title for buttons with images on top or bottom more than necessary.
+#pragma warning disable CA1416 // TODO: 'UIButton.ContentEdgeInsets' is unsupported on: 'ios' 15.0 and later.
+#pragma warning disable CA1422 // Validate platform compatibility
+ platformButton.ContentEdgeInsets = new UIEdgeInsets(
+ (float)top,
+ (float)padding.Left,
+ (float)bottom,
+ (float)padding.Right);
+#pragma warning restore CA1422 // Validate platform compatibility
+#pragma warning restore CA1416
+ }
+
+ internal static void UpdateContentEdgeInsets(this UIButton platformButton, IButton button, Thickness? defaultPadding = null) =>
+ UpdateContentEdgeInsets(platformButton, button.Padding, defaultPadding);
+
+ internal static void UpdateContentEdgeInsets(this UIButton platformButton, Thickness padding, Thickness? defaultPadding = null)
+ {
+ // top and bottom insets reset to a "default" if they are exactly 0
+ // however, internally they are floor-ed, so there is no actual fractions
+ var top = padding.Top;
+ if (top == 0.0)
+ top = AlmostZero;
+ var bottom = padding.Bottom;
+ if (bottom == 0.0)
+ bottom = AlmostZero;
+
#pragma warning disable CA1416 // TODO: 'UIButton.ContentEdgeInsets' is unsupported on: 'ios' 15.0 and later.
#pragma warning disable CA1422 // Validate platform compatibility
platformButton.ContentEdgeInsets = new UIEdgeInsets(
diff --git a/src/Core/src/Platform/iOS/WrapperView.cs b/src/Core/src/Platform/iOS/WrapperView.cs
index 5412cad270d9..7cf656e6d286 100644
--- a/src/Core/src/Platform/iOS/WrapperView.cs
+++ b/src/Core/src/Platform/iOS/WrapperView.cs
@@ -11,6 +11,17 @@ namespace Microsoft.Maui.Platform
{
public partial class WrapperView : UIView, IDisposable, IUIViewLifeCycleEvents
{
+ WeakReference? _crossPlatformLayoutReference;
+
+ internal ICrossPlatformLayout? CrossPlatformLayout
+ {
+ get => _crossPlatformLayoutReference != null && _crossPlatformLayoutReference.TryGetTarget(out var v) ? v : null;
+ set => _crossPlatformLayoutReference = value == null ? null : new WeakReference(value);
+ }
+
+ double _lastMeasureHeight = double.NaN;
+ double _lastMeasureWidth = double.NaN;
+
CAShapeLayer? _maskLayer;
CAShapeLayer? _backgroundMaskLayer;
CAShapeLayer? _shadowLayer;
@@ -26,6 +37,19 @@ public WrapperView(CGRect frame)
{
}
+ internal bool IsMeasureValid(double widthConstraint, double heightConstraint)
+ {
+ // Check the last constraints this View was measured with; if they're the same,
+ // then the current measure info is already correct and we don't need to repeat it
+ return heightConstraint == _lastMeasureHeight && widthConstraint == _lastMeasureWidth;
+ }
+
+ internal void CacheMeasureConstraints(double widthConstraint, double heightConstraint)
+ {
+ _lastMeasureWidth = widthConstraint;
+ _lastMeasureHeight = heightConstraint;
+ }
+
CAShapeLayer? MaskLayer
{
get => _maskLayer;
@@ -103,6 +127,17 @@ public override void LayoutSubviews()
SetClip();
SetShadow();
SetBorder();
+
+ var boundWidth = Bounds.Width;
+ var boundHeight = Bounds.Height;
+
+ if (!IsMeasureValid(boundWidth, boundHeight))
+ {
+ CrossPlatformLayout?.CrossPlatformMeasure(boundWidth, boundHeight);
+ CacheMeasureConstraints(boundWidth, boundHeight);
+ }
+
+ CrossPlatformLayout?.CrossPlatformArrange(Bounds.ToRectangle());
}
internal void Disconnect()
@@ -124,41 +159,81 @@ internal void Disconnect()
public override CGSize SizeThatFits(CGSize size)
{
var subviews = Subviews;
- if (subviews.Length == 0)
- return base.SizeThatFits(size);
+ CGSize returnSize;
- var child = subviews[0];
-
- // Calling SizeThatFits on an ImageView always returns the image's dimensions, so we need to call the extension method
- // This also affects ImageButtons
- if (child is UIImageView imageView)
+ if (subviews.Length == 0)
{
- return imageView.SizeThatFitsImage(size);
+ returnSize = base.SizeThatFits(size);
}
- else if (child is UIButton imageButton && imageButton.ImageView?.Image is not null && imageButton.CurrentTitle is null)
+
+ else
{
- return imageButton.ImageView.SizeThatFitsImage(size);
+ var child = subviews[0];
+
+ // Calling SizeThatFits on an ImageView always returns the image's dimensions, so we need to call the extension method
+ // This also affects ImageButtons
+ if (child is UIImageView imageView)
+ {
+ returnSize = imageView.SizeThatFitsImage(size);
+ }
+ else if (CrossPlatformLayout is not null)
+ {
+ returnSize = CrossPlatformLayout.CrossPlatformMeasure(size.Width, size.Height).ToCGSize();
+ }
+ else if (child is UIButton imageButton && imageButton.ImageView?.Image is not null && imageButton.CurrentTitle is null)
+ {
+ returnSize = imageButton.ImageView.SizeThatFitsImage(size);
+ }
+ else
+ {
+ returnSize = child.SizeThatFits(size);
+ }
}
- return child.SizeThatFits(size);
+ CacheMeasureConstraints(size.Width, size.Height);
+ return returnSize;
}
- internal CGSize SizeThatFitsWrapper(CGSize originalSpec, double virtualViewWidth, double virtualViewHeight)
+ internal CGSize SizeThatFitsWrapper(CGSize originalSpec, double virtualViewWidth, double virtualViewHeight, IView view)
{
var subviews = Subviews;
- if (subviews.Length == 0)
- return base.SizeThatFits(originalSpec);
+ CGSize returnSize;
+ var widthConstraint = IsExplicitSet(virtualViewWidth) ? virtualViewWidth : originalSpec.Width;
+ var heightConstraint = IsExplicitSet(virtualViewHeight) ? virtualViewHeight : originalSpec.Height;
- var child = subviews[0];
+ if (subviews.Length == 0)
+ {
+ returnSize = base.SizeThatFits(originalSpec);
+ }
- if (child is UIImageView || (child is UIButton imageButton && imageButton.ImageView?.Image is not null && imageButton.CurrentTitle is null))
+ else
{
- var widthConstraint = IsExplicitSet(virtualViewWidth) ? virtualViewWidth : originalSpec.Width;
- var heightConstraint = IsExplicitSet(virtualViewHeight) ? virtualViewHeight : originalSpec.Height;
- return SizeThatFits(new CGSize(widthConstraint, heightConstraint));
+ var child = subviews[0];
+
+ if (child is UIImageView || (child is UIButton imageButton && imageButton.ImageView?.Image is not null && imageButton.CurrentTitle is null))
+ {
+ if(CrossPlatformLayout is not null)
+ {
+ returnSize = CrossPlatformLayout.CrossPlatformMeasure(widthConstraint, heightConstraint);
+ }
+ else
+ {
+ returnSize = SizeThatFits(new CGSize(widthConstraint, heightConstraint));
+ }
+ }
+
+ else if (CrossPlatformLayout is not null)
+ {
+ returnSize = CrossPlatformLayout.CrossPlatformMeasure(widthConstraint, heightConstraint);
+ }
+ else
+ {
+ returnSize = SizeThatFits(originalSpec);
+ }
}
- return SizeThatFits(originalSpec);
+ CacheMeasureConstraints(widthConstraint, heightConstraint);
+ return returnSize;
}
public override void SetNeedsLayout()
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index ca62fe9a0c53..f55327321aee 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -49,6 +49,7 @@ Microsoft.Maui.Platform.MauiScrollView
Microsoft.Maui.Platform.MauiScrollView.MauiScrollView() -> void
Microsoft.Maui.SoftInputExtensions
override Microsoft.Maui.Handlers.ButtonHandler.NeedsContainer.get -> bool
+override Microsoft.Maui.Handlers.ButtonHandler.SetupContainer() -> void
override Microsoft.Maui.Handlers.ContentViewHandler.DisconnectHandler(Microsoft.Maui.Platform.ContentView! platformView) -> void
override Microsoft.Maui.Handlers.ImageButtonHandler.NeedsContainer.get -> bool
override Microsoft.Maui.Handlers.RefreshViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
@@ -159,5 +160,7 @@ Microsoft.Maui.Platform.MauiView.IsMeasureValid(double widthConstraint, double h
*REMOVED*override Microsoft.Maui.Platform.ContentView.SetNeedsLayout() -> void
Microsoft.Maui.Platform.UIEdgeInsetsExtensions
static Microsoft.Maui.Platform.UIEdgeInsetsExtensions.ToThickness(this UIKit.UIEdgeInsets insets) -> Microsoft.Maui.Thickness
+override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void
+*REMOVED*override Microsoft.Maui.Platform.MauiLabel.InvalidateIntrinsicContentSize() -> voidrect) -> void
*REMOVED*override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void
*REMOVED*override Microsoft.Maui.Platform.MauiLabel.InvalidateIntrinsicContentSize() -> void
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index e0f78a39c1f7..649e7f7caeb0 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -50,6 +50,8 @@ Microsoft.Maui.Platform.MauiScrollView
Microsoft.Maui.Platform.MauiScrollView.MauiScrollView() -> void
Microsoft.Maui.Platform.KeyboardAutoManagerScroll
Microsoft.Maui.SoftInputExtensions
+override Microsoft.Maui.Handlers.ButtonHandler.SetupContainer() -> void
+override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void
*REMOVED*override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void
override Microsoft.Maui.Handlers.ButtonHandler.NeedsContainer.get -> bool
override Microsoft.Maui.Handlers.ContentViewHandler.DisconnectHandler(Microsoft.Maui.Platform.ContentView! platformView) -> void