[Windows] Correctly size the ImageButton BitmapImage (#6663)

* Correctly size the Windows ImageButton BitmapImage * Update logic to set ImageButton image size * Remove unnecessary changes
dotnet · May 11, 2022 · 6ff3e58 · 6ff3e58
1 parent 83c43b3
commit 6ff3e58
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/ImageButtonPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/ImageButtonPage.xaml
@@ -14,8 +14,7 @@
                     Style="{StaticResource Headline}"/>
                 <ImageButton 
                     HorizontalOptions="Center" 
-                    WidthRequest="200"
-
+                    WidthRequest="200"    
                     Clicked="OnImageButtonClicked"
                     Aspect="AspectFit" 
                     Background="Green"
@@ -84,6 +83,15 @@
                     Source="cog.png"
                     CornerRadius="10"
                     BackgroundColor="Purple"/>
+                <Label
+                    Text="Custom Size"
+                    Style="{StaticResource Headline}"/>
+                <ImageButton
+                    x:Name="ResizeImageButton"
+                    Source="dotnet_bot.png"
+                    WidthRequest="40"
+                    HeightRequest="40" 
+                    Clicked="OnResizeImageButtonClicked"/>
             </VerticalStackLayout>
         </ScrollView>
     </views:BasePage.Content>

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/ImageButtonPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/ImageButtonPage.xaml.cs
@@ -21,6 +21,12 @@ void OnImageButtonClicked(object sender, EventArgs e)
 			_clickTotal += 1;
 			InfoLabel.Text = $"{_clickTotal} ImageButton click{(_clickTotal == 1 ? "" : "s")}";
 		}
+
+		void OnResizeImageButtonClicked(object sender, EventArgs e)
+		{
+			ResizeImageButton.HeightRequest = 100;
+			ResizeImageButton.WidthRequest = 100;
+		}
 	}
 
 	public class ImageButtonPageViewModel : BindableObject

diff --git a/src/Core/src/Platform/Windows/ButtonExtensions.cs b/src/Core/src/Platform/Windows/ButtonExtensions.cs
@@ -169,15 +169,14 @@ void OnImageOpened(object sender, RoutedEventArgs e)
 						{
 							bitmapImage.ImageOpened -= OnImageOpened;
 
-							// check if the image that just loaded is still the current image
+							// Check if the image that just loaded is still the current image
 							var actualImageSource = sender as BitmapImage;
+
 							if (actualImageSource is not null && nativeImage.Source == actualImageSource)
-							{
-								// do the actual resize
-								var imageSourceSize = actualImageSource.GetImageSourceSize(platformButton);
-								nativeImage.Width = imageSourceSize.Width;
-								nativeImage.Height = imageSourceSize.Height;
-							}
+								nativeImage.Height = nativeImage.Width = Primitives.Dimension.Unset;
+
+							if (platformButton.Parent is FrameworkElement frameworkElement)
+								frameworkElement.InvalidateMeasure();
 						};
 					}
 				}