From 8375a155e9bba11c1d2cd542eea3948f1dadeaf7 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 15 Feb 2016 20:57:22 +0100
Subject: [PATCH] Added disabled state to CheckBox.

---
 .../ControlCatalog/Pages/CheckBoxPage.paml    |  2 +-
 src/Perspex.Themes.Default/CheckBox.paml      | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/samples/ControlCatalog/Pages/CheckBoxPage.paml b/samples/ControlCatalog/Pages/CheckBoxPage.paml
index 0f7003efb4..bb1d991980 100644
--- a/samples/ControlCatalog/Pages/CheckBoxPage.paml
+++ b/samples/ControlCatalog/Pages/CheckBoxPage.paml
@@ -9,7 +9,7 @@
                 Gap="16">
       <CheckBox>Unchecked</CheckBox>
       <CheckBox IsChecked="True">Checked</CheckBox>
-      <CheckBox IsEnabled="False">Disabled</CheckBox>
+      <CheckBox IsChecked="True" IsEnabled="False">Disabled</CheckBox>
     </StackPanel>    
   </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Perspex.Themes.Default/CheckBox.paml b/src/Perspex.Themes.Default/CheckBox.paml
index b45210cfdb..cea4b2d114 100644
--- a/src/Perspex.Themes.Default/CheckBox.paml
+++ b/src/Perspex.Themes.Default/CheckBox.paml
@@ -5,19 +5,21 @@
     <Setter Property="Template">
       <ControlTemplate>
         <Grid ColumnDefinitions="Auto,*">
-          <Border BorderBrush="{TemplateBinding BorderBrush}"
+          <Border Name="border"
+                  BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
                   Width="18"
                   Height="18"
-                  VerticalAlignment="Center"/>
-          <Path Name="checkMark"
-                Fill="#ff333333"
-                Width="11"
-                Height="10"
-                Stretch="Uniform"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"/>
+                  VerticalAlignment="Center">
+            <Path Name="checkMark"
+                  Fill="#ff333333"
+                  Width="11"
+                  Height="10"
+                  Stretch="Uniform"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"/>
+          </Border>
           <ContentPresenter Name="PART_ContentPresenter"
                             Content="{TemplateBinding Content}"
                             Margin="4,0,0,0"
@@ -33,4 +35,7 @@
   <Style Selector="CheckBox:checked /template/ Path#checkMark">
     <Setter Property="IsVisible" Value="True"/>
   </Style>
+  <Style Selector="CheckBox:disabled /template/ Border#border">
+    <Setter Property="Opacity" Value="0.5"/>
+  </Style>
 </Styles>
\ No newline at end of file