(MahAppsGH-3136) DoubleToGridLengthConverter is not necessary

timunie · Sep 2, 2019 · a408373 · a408373
1 parent 49673aa
commit a408373
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 30 deletions.
diff --git a/src/MahApps.Metro/Converters/DoubleToGridLengthConverter.cs b/src/MahApps.Metro/Converters/DoubleToGridLengthConverter.cs
diff --git a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
@@ -1,10 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
-                    xmlns:Converter="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Converter:DoubleToGridLengthConverter x:Key="DoubleToGridLengthConverter" />
-
     <!--  ********************************** CheckBoxStyle **********************************  -->
     <!--  adapted from http://brianlagunas.com/free-metro-light-and-dark-themes-for-wpf-and-silverlight-microsoft-controls/  -->
     <Style x:Key="MahApps.Styles.CheckBox" TargetType="CheckBox">
@@ -29,7 +26,7 @@
                 <ControlTemplate TargetType="CheckBox">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition x:Name="LeftCol" Width="{TemplateBinding Controls:CheckBoxHelper.CheckBoxSize,Converter={StaticResource DoubleToGridLengthConverter}}" />
+                            <ColumnDefinition x:Name="LeftCol" Width="Auto" />
                             <ColumnDefinition x:Name="RightCol" Width="*" />
                         </Grid.ColumnDefinitions>
                         <Grid x:Name="PART_CHECKBOX">
@@ -179,7 +176,7 @@
                             <Setter Property="Padding" Value="0 0 6 0" />
                             <Setter TargetName="LeftCol" Property="Width" Value="*" />
                             <Setter TargetName="PART_CHECKBOX" Property="Grid.Column" Value="1" />
-                            <Setter TargetName="RightCol" Property="Width" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=CheckBox}, Path=(Controls:CheckBoxHelper.CheckBoxSize), Converter={StaticResource DoubleToGridLengthConverter}}" />
+                            <Setter TargetName="RightCol" Property="Width" Value="Auto" />
                             <Setter TargetName="contentPresenter" Property="Grid.Column" Value="0" />
                         </Trigger>
                     </ControlTemplate.Triggers>