Button Layout gallery page: don't set initial Padding (#6599) fixes #6469

diff --git a/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml b/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml
index 1b7417d..533db72 100644 (file)
--- a/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml
+++ b/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml
@@ -6,7 +6,7 @@
 
        <ContentPage.Resources>
                <ResourceDictionary>
-                       <local:ThicknessConverter x:Key="ThicknessConverter" />
+            <local:NullableThicknessConverter x:Key="NullableThicknessConverter" />
                        <Style TargetType="Label">
                                <Setter Property="FontSize" Value="12" />
                        </Style>
@@ -32,7 +32,7 @@
 
                        <Label Text="Autosized:" Margin="0,0,0,-5" />
                        <StackLayout Orientation="Horizontal" Padding="0" Spacing="5">
-                               <Button x:Name="autosizedButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" Padding="{Binding ButtonPadding}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}" />
+                               <Button x:Name="autosizedButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}" />
                        </StackLayout>
 
                        <Label Text="Explicit Size:" Margin="0,0,0,-5" />
@@ -47,19 +47,19 @@
                                </Grid.ColumnDefinitions>
 
                                <Button
-                                       x:Name="explicitButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" Padding="{Binding ButtonPadding}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}"
+                                       x:Name="explicitButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}"
                                        WidthRequest="120" HeightRequest="60" HorizontalOptions="Start" VerticalOptions="Start" />
                                <Button
-                                       x:Name="explicitWidthButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" Padding="{Binding ButtonPadding}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}"
+                                       x:Name="explicitWidthButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}"
                                        Grid.Column="1" Grid.RowSpan="2" WidthRequest="120" HorizontalOptions="Start" VerticalOptions="Start" />
                                <Button
-                                       x:Name="explicitHeightButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" Padding="{Binding ButtonPadding}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}"
+                                       x:Name="explicitHeightButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}"
                                        Grid.Row="1" Grid.ColumnSpan="2" HeightRequest="60" HorizontalOptions="Start" VerticalOptions="Start" />
                        </Grid>
 
                        <Label Text="Stretched:" Margin="0,0,0,-5" />
                        <StackLayout Orientation="Vertical" Padding="0" Spacing="5">
-                               <Button x:Name="stretchedButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" Padding="{Binding ButtonPadding}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}" />
+                               <Button x:Name="stretchedButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}" />
                        </StackLayout>
 
                        <Label Text="Options:" Margin="0,5,0,0" FontAttributes="Bold" />
@@ -111,7 +111,7 @@
 
                                <StackLayout Orientation="Vertical" Padding="0" Spacing="0" HorizontalOptions="FillAndExpand">
                                        <Label Text="Padding:" />
-                                       <Entry Text="{Binding ButtonPadding, Converter={StaticResource ThicknessConverter}, Mode=OneWayToSource, TargetNullValue='0, 0, 0, 0'}" HorizontalOptions="FillAndExpand" />
+                    <Entry Text="{Binding ButtonPadding, Converter={StaticResource NullableThicknessConverter}, Mode=OneWayToSource, TargetNullValue='0, 0, 0, 0'}" HorizontalOptions="FillAndExpand" />
                                </StackLayout>
 
                                <StackLayout Orientation="Vertical" Padding="0" Spacing="0">

diff --git a/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml.cs b/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml.cs
index 1bac86c..ef1eca5 100644 (file)
--- a/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml.cs
+++ b/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml.cs
@@ -17,7 +17,7 @@ namespace Xamarin.Forms.Controls
                string _buttonText = "Text";
                string _buttonImage = "bank.png";
 
-               Thickness _buttonPadding = default(Thickness);
+               Thickness? _buttonPadding;
 
                double _buttonFontSize = -1.0;
 
@@ -98,13 +98,24 @@ namespace Xamarin.Forms.Controls
                        }
                }
 
-               public Thickness ButtonPadding
+               public Thickness? ButtonPadding
                {
                        get => _buttonPadding;
                        set
                        {
+                               if (Equals(_buttonPadding, value))
+                                       return;
+
                                _buttonPadding = value;
                                OnPropertyChanged();
+
+                               foreach (var button in _buttons)
+                               {
+                                       if (_buttonPadding != null)
+                                               button.Padding = _buttonPadding.Value;
+                                       else
+                                               button.ClearValue(Button.PaddingProperty);
+                               }
                        }
                }
 

diff --git a/Xamarin.Forms.Controls/ThicknessConverter.cs b/Xamarin.Forms.Controls/NullableThicknessConverter.cs
similarity index 83%
rename from Xamarin.Forms.Controls/ThicknessConverter.cs
rename to Xamarin.Forms.Controls/NullableThicknessConverter.cs
index 8120ba1..d21181d 100644 (file)
--- a/Xamarin.Forms.Controls/ThicknessConverter.cs
+++ b/Xamarin.Forms.Controls/NullableThicknessConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 
 namespace Xamarin.Forms.Controls
 {
-       public class ThicknessConverter : IValueConverter
+       public class NullableThicknessConverter : IValueConverter
        {
                ThicknessTypeConverter _converter = new ThicknessTypeConverter();
 
@@ -12,11 +12,14 @@ namespace Xamarin.Forms.Controls
                        if (value is Thickness thickness)
                                return $"{thickness.Left}, {thickness.Top}, {thickness.Right}, {thickness.Bottom}";
 
-                       return "0, 0, 0, 0";
+                       return string.Empty;
                }
 
                public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
                {
+                       if (value is null)
+                               return null;
+
                        if (value is Thickness thickness)
                                return thickness;
 
@@ -30,7 +33,7 @@ namespace Xamarin.Forms.Controls
                                // no-op
                        }
 
-                       return default(Thickness);
+                       return null;
                }
        }
 }