Skip to content

[Windows] Ensure images in buttons never scale up, only down #21463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 28, 2024
Merged

[Windows] Ensure images in buttons never scale up, only down #21463

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c7130a
Ensure images in buttons never scale up, only down
Mar 26, 2024
2a6e814
Use `GetImageSourceSize`
Mar 26, 2024
4f9c994
Port UI tests from https://github.com/dotnet/maui/pull/20953
Mar 27, 2024
e7757be
Ensure max height is reset
Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions src/Core/src/Platform/Windows/ButtonExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,25 @@ public static void UpdateImageSource(this Button platformButton, WImageSource? n
// to the desired size of the font, otherwise it will be stretched to the available space
if (nativeImage.Source is CanvasImageSource canvas)
{
nativeImage.Width = canvas.Size.Width;
nativeImage.Height = canvas.Size.Height;
var size = canvas.GetImageSourceSize(platformButton);
nativeImage.Width = size.Width;
nativeImage.Height = size.Height;
}

// Ensure that we only scale images down and never up
if (nativeImageSource is BitmapImage bitmapImage)
{
bitmapImage.ImageOpened += OnImageOpened;
void OnImageOpened(object sender, RoutedEventArgs e)
{
bitmapImage.ImageOpened -= OnImageOpened;

var actualImageSource = sender as BitmapImage;
if (actualImageSource is not null)
{
nativeImage.MaxHeight = nativeImageSource.GetImageSourceSize(platformButton).Height;
}
}
}

nativeImage.Visibility = nativeImageSource == null
Expand Down