Skip to content

Commit ee77ebd

Browse files
committed
Merge pull request #1 from xaviergonz/xaviergonz-patch-1
Fix to previous commit since TemplateBinding cannot be used from Trig…
2 parents bda4f23 + c338747 commit ee77ebd

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<Canvas Width="24" Height="24">
8787
<Path x:Name="Graphic"
8888
Data="M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3M19,5V19H5V5H19Z"
89-
Fill="{DynamicResource MaterialDesignCheckBoxOff}" />
89+
Fill="{TemplateBinding Background}" />
9090
<Ellipse x:Name="InteractionEllipse" Fill="{TemplateBinding Foreground}" Width="0" Height="0" Canvas.Top="12" Canvas.Left="12" Opacity="0" RenderTransformOrigin="0.5,0.5"
9191
IsHitTestVisible="False">
9292
<Ellipse.RenderTransform>
@@ -116,11 +116,14 @@
116116
<Trigger Property="IsPressed" Value="true"/>
117117
<Trigger Property="IsChecked" Value="true">
118118
<Setter Property="Data" TargetName="Graphic" Value="M10,17L5,12L6.41,10.58L10,14.17L17.59,6.58L19,8M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" />
119-
<Setter Property="Fill" TargetName="Graphic" Value="{TemplateBinding Background}" />
119+
</Trigger>
120+
<Trigger Property="IsChecked" Value="False">
121+
<Setter Property="Fill" TargetName="Graphic" Value="{DynamicResource MaterialDesignCheckBoxOff}" />
120122
</Trigger>
121123
<Trigger Property="IsChecked" Value="{x:Null}">
122124
<Setter Property="Data" TargetName="Graphic" Value="M10,17L5,12L6.41,10.58L10,14.17L17.59,6.58L19,8M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" />
123125
<Setter Property="Opacity" TargetName="Graphic" Value="0.56"/>
126+
<Setter Property="Fill" TargetName="Graphic" Value="{DynamicResource MaterialDesignCheckBoxOff}" />
124127
</Trigger>
125128
</ControlTemplate.Triggers>
126129
</ControlTemplate>

0 commit comments

Comments
 (0)