[iOS] Fix Button image sizing and layout (#22476)

dotnet · Aug 27, 2024 · 588eece · 588eece
1 parent 1b00140
commit 588eece
Show file tree

Hide file tree

Showing 92 changed files with 2,261 additions and 188 deletions.
diff --git 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" />
                 <Label
-                    Text="Click To Change Positionng"
+                    Text="Click To Change Positioning"
                     Style="{StaticResource Headline}"/>
                 <Button 
                     x:Name="positionChange" ContentLayout="Top" TextColor="White" Background="Black" 
@@ -245,6 +245,20 @@
                 <Button
                     Text="End"
                     HorizontalOptions="End" />
+                 <Label
+                    Text="Slide to change the Border Width:"
+                    Style="{StaticResource Headline}"/>
+                <Button
+                    Text="BorderWidth Changing"
+                    ImageSource="settings.png"
+                    HorizontalOptions="Center"
+                    BackgroundColor="Green"
+                    BorderWidth="{Binding Source={x:Reference BorderWidthSlider}, Path=Value}" />
+                <Slider
+                    x:Name="BorderWidthSlider"
+                    Minimum="0"
+                    Maximum="100"
+                    Value ="0"/>
             </VerticalStackLayout>
         </ScrollView>
     </views:BasePage.Content>

diff --git 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<Button, IButtonHandler>(nameof(ContentLayout), MapContentLayout);
 #if IOS
 			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(Padding), MapPadding);
+			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(BorderWidth), MapBorderWidth);
 #endif
 #if WINDOWS
 			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(ImageSource), MapImageSource);