From 594e8dc702786da4928d55c36fd9cfaeba8dd8be Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 31 Mar 2016 19:19:28 +0200
Subject: [PATCH 1/5] Display ScrollViewer.Background.

---
 src/Perspex.Themes.Default/ScrollViewer.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Perspex.Themes.Default/ScrollViewer.xaml b/src/Perspex.Themes.Default/ScrollViewer.xaml
index becdaab70e..cdba71435f 100644
--- a/src/Perspex.Themes.Default/ScrollViewer.xaml
+++ b/src/Perspex.Themes.Default/ScrollViewer.xaml
@@ -1,7 +1,7 @@
 <Style xmlns="https://github.com/perspex" Selector="ScrollViewer">
   <Setter Property="Template">
     <ControlTemplate>
-      <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto">
+      <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,Auto" Background="{TemplateBinding Background}">
         <ScrollContentPresenter Name="PART_ContentPresenter"
                                 Content="{TemplateBinding Content}"
                                 Extent="{TemplateBinding Path=Extent, Mode=TwoWay}"

From b43b5947b9092a06e0b08d6835e5922c110f0830 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 31 Mar 2016 19:20:07 +0200
Subject: [PATCH 2/5] Make ControlCatalog SideBar scrollable.

---
 samples/ControlCatalog/SideBar.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog/SideBar.xaml b/samples/ControlCatalog/SideBar.xaml
index 3d94957f76..c838152a41 100644
--- a/samples/ControlCatalog/SideBar.xaml
+++ b/samples/ControlCatalog/SideBar.xaml
@@ -3,7 +3,7 @@
     <Setter Property="Template">
       <ControlTemplate>
         <DockPanel>
-          <Border MinWidth="190" Background="{StyleResource ThemeAccentBrush}" DockPanel.Dock="Left">
+          <ScrollViewer MinWidth="190" Background="{StyleResource ThemeAccentBrush}" DockPanel.Dock="Left">
             <TabStrip Name="PART_TabStrip"
                       MemberSelector="{Static TabControl.HeaderSelector}"
                       Items="{TemplateBinding Items}"
@@ -14,7 +14,7 @@
                 </ItemsPanelTemplate>
               </TabStrip.ItemsPanel>
             </TabStrip>
-          </Border>
+          </ScrollViewer>
           <Carousel Name="PART_Content"
                     Margin="8 0 0 0"
                     MemberSelector="{Static TabControl.ContentSelector}"

From adf30e529df5826a37eca570f2fc37960a2875a6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 31 Mar 2016 19:27:57 +0200
Subject: [PATCH 3/5] Added RadioButton to ControlCatalog.

And added disabled style.
---
 samples/ControlCatalog/ControlCatalog.csproj   |  8 ++++++++
 samples/ControlCatalog/MainWindow.xaml         |  1 +
 .../ControlCatalog/Pages/RadioButtonPage.xaml  | 15 +++++++++++++++
 .../Pages/RadioButtonPage.xaml.cs              | 18 ++++++++++++++++++
 src/Perspex.Themes.Default/RadioButton.xaml    |  3 +++
 5 files changed, 45 insertions(+)
 create mode 100644 samples/ControlCatalog/Pages/RadioButtonPage.xaml
 create mode 100644 samples/ControlCatalog/Pages/RadioButtonPage.xaml.cs

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index fb86760502..9f7533fa30 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -61,6 +61,9 @@
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\RadioButtonPage.xaml.cs">
+      <DependentUpon>RadioButtonPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\MenuPage.xaml.cs">
       <DependentUpon>MenuPage.xaml</DependentUpon>
     </Compile>
@@ -242,6 +245,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\RadioButtonPage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index d4ba90ceaa..dc827ee436 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -13,6 +13,7 @@
     <TabItem Header="DropDown"><pages:DropDownPage/></TabItem>
     <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
     <TabItem Header="Menu"><pages:MenuPage/></TabItem>
+    <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
     <TabItem Header="Slider"><pages:SliderPage/></TabItem>
     <TabItem Header="TextBox"><pages:TextBoxPage/></TabItem>
     <TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/RadioButtonPage.xaml b/samples/ControlCatalog/Pages/RadioButtonPage.xaml
new file mode 100644
index 0000000000..5bace4780a
--- /dev/null
+++ b/samples/ControlCatalog/Pages/RadioButtonPage.xaml
@@ -0,0 +1,15 @@
+<UserControl xmlns="https://github.com/perspex">
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Classes="h1">RadioButton</TextBlock>
+    <TextBlock Classes="h2">Allows the selection of a single option of many</TextBlock>
+
+    <StackPanel Orientation="Vertical"
+                Margin="0,16,0,0"
+                HorizontalAlignment="Center"
+                Gap="16">
+      <RadioButton IsChecked="True">Option 1</RadioButton>
+      <RadioButton>Option 2</RadioButton>
+      <RadioButton IsEnabled="False">Disabled</RadioButton>
+    </StackPanel>    
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/RadioButtonPage.xaml.cs b/samples/ControlCatalog/Pages/RadioButtonPage.xaml.cs
new file mode 100644
index 0000000000..c7816ff27e
--- /dev/null
+++ b/samples/ControlCatalog/Pages/RadioButtonPage.xaml.cs
@@ -0,0 +1,18 @@
+using Perspex.Controls;
+using Perspex.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class RadioButtonPage : UserControl
+    {
+        public RadioButtonPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            PerspexXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/src/Perspex.Themes.Default/RadioButton.xaml b/src/Perspex.Themes.Default/RadioButton.xaml
index ad060efefa..8fc0b14179 100644
--- a/src/Perspex.Themes.Default/RadioButton.xaml
+++ b/src/Perspex.Themes.Default/RadioButton.xaml
@@ -37,4 +37,7 @@
   <Style Selector="RadioButton:checked /template/ Ellipse#checkMark">
     <Setter Property="IsVisible" Value="True"/>
   </Style>
+  <Style Selector="RadioButton:disabled /template/ Ellipse#border">
+    <Setter Property="Opacity" Value="{StyleResource ThemeDisabledOpacity}"/>
+  </Style>
 </Styles>
\ No newline at end of file

From 85f1c3a5c7ac3ced04bf7b907428c146482b1ff6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 31 Mar 2016 19:43:50 +0200
Subject: [PATCH 4/5] Added Expander to ControlCatalog.

And fixed bug with CrossFade.
---
 samples/ControlCatalog/ControlCatalog.csproj  |  8 +++++
 samples/ControlCatalog/MainWindow.xaml        |  1 +
 .../ControlCatalog/Pages/ExpanderPage.xaml    | 32 +++++++++++++++++++
 .../ControlCatalog/Pages/ExpanderPage.xaml.cs | 18 +++++++++++
 src/Perspex.Controls/Expander.cs              |  2 +-
 src/Perspex.SceneGraph/Animation/CrossFade.cs |  5 ++-
 6 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 samples/ControlCatalog/Pages/ExpanderPage.xaml
 create mode 100644 samples/ControlCatalog/Pages/ExpanderPage.xaml.cs

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 9f7533fa30..06fab19d96 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -61,6 +61,9 @@
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\ExpanderPage.xaml.cs">
+      <DependentUpon>ExpanderPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\RadioButtonPage.xaml.cs">
       <DependentUpon>RadioButtonPage.xaml</DependentUpon>
     </Compile>
@@ -250,6 +253,11 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\ExpanderPage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index dc827ee436..b3bd010ede 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -11,6 +11,7 @@
     <TabItem Header="Carousel"><pages:CarouselPage/></TabItem>
     <TabItem Header="CheckBox"><pages:CheckBoxPage/></TabItem>
     <TabItem Header="DropDown"><pages:DropDownPage/></TabItem>
+    <TabItem Header="Expander"><pages:ExpanderPage/></TabItem>
     <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
     <TabItem Header="Menu"><pages:MenuPage/></TabItem>
     <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/ExpanderPage.xaml b/samples/ControlCatalog/Pages/ExpanderPage.xaml
new file mode 100644
index 0000000000..d019cb59ed
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ExpanderPage.xaml
@@ -0,0 +1,32 @@
+<UserControl xmlns="https://github.com/perspex">
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Classes="h1">Expander</TextBlock>
+    <TextBlock Classes="h2">Expands to show nested content</TextBlock>
+
+    <StackPanel Orientation="Vertical"
+                Margin="0,16,0,0"
+                HorizontalAlignment="Center"
+                Gap="16">
+      <Expander Header="Expand Up" ExpandDirection="Up">
+        <StackPanel>
+          <TextBlock>Expanded content</TextBlock>
+        </StackPanel>
+      </Expander>
+      <Expander Header="Expand Down" ExpandDirection="Down">
+        <StackPanel>
+          <TextBlock>Expanded content</TextBlock>
+        </StackPanel>
+      </Expander>
+      <Expander Header="Expand Left" ExpandDirection="Left">
+        <StackPanel>
+          <TextBlock>Expanded content</TextBlock>
+        </StackPanel>
+      </Expander>
+      <Expander Header="Expand Right" ExpandDirection="Right">
+        <StackPanel>
+          <TextBlock>Expanded content</TextBlock>
+        </StackPanel>
+      </Expander>
+    </StackPanel>    
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs b/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs
new file mode 100644
index 0000000000..6ffa0dab5f
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ExpanderPage.xaml.cs
@@ -0,0 +1,18 @@
+using Perspex.Controls;
+using Perspex.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class ExpanderPage : UserControl
+    {
+        public ExpanderPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            PerspexXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/src/Perspex.Controls/Expander.cs b/src/Perspex.Controls/Expander.cs
index be46949c22..3d1e99a20b 100644
--- a/src/Perspex.Controls/Expander.cs
+++ b/src/Perspex.Controls/Expander.cs
@@ -15,7 +15,7 @@ namespace Perspex.Controls
     public class Expander : HeaderedContentControl
     {
         public static readonly StyledProperty<bool> IsExpandedProperty =
-            PerspexProperty.Register<Expander, bool>(nameof(IsExpanded), true);
+            PerspexProperty.Register<Expander, bool>(nameof(IsExpanded));
 
         public static readonly StyledProperty<ExpandDirection> ExpandDirectionProperty =
             PerspexProperty.Register<Expander, ExpandDirection>(nameof(ExpandDirection), ExpandDirection.Down);
diff --git a/src/Perspex.SceneGraph/Animation/CrossFade.cs b/src/Perspex.SceneGraph/Animation/CrossFade.cs
index 722082801d..65697d4245 100644
--- a/src/Perspex.SceneGraph/Animation/CrossFade.cs
+++ b/src/Perspex.SceneGraph/Animation/CrossFade.cs
@@ -89,7 +89,10 @@ namespace Perspex.Animation
                 from.Opacity = 1;
             }
 
-            to.Opacity = 1;
+            if (to != null)
+            {
+                to.Opacity = 1;
+            }
         }
 
         /// <summary>

From 152b4000a89222ba777f621856ec010757dd997d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Thu, 31 Mar 2016 20:07:17 +0200
Subject: [PATCH 5/5] Added Image to ControlCatalog.

---
 samples/ControlCatalog/ControlCatalog.csproj  |  8 ++++
 samples/ControlCatalog/MainWindow.xaml        |  1 +
 samples/ControlCatalog/Pages/ImagePage.xaml   | 39 +++++++++++++++++++
 .../ControlCatalog/Pages/ImagePage.xaml.cs    | 18 +++++++++
 4 files changed, 66 insertions(+)
 create mode 100644 samples/ControlCatalog/Pages/ImagePage.xaml
 create mode 100644 samples/ControlCatalog/Pages/ImagePage.xaml.cs

diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 06fab19d96..087998c805 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -61,6 +61,9 @@
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\ImagePage.xaml.cs">
+      <DependentUpon>ImagePage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\ExpanderPage.xaml.cs">
       <DependentUpon>ExpanderPage.xaml</DependentUpon>
     </Compile>
@@ -258,6 +261,11 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\ImagePage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index b3bd010ede..69692a073f 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -12,6 +12,7 @@
     <TabItem Header="CheckBox"><pages:CheckBoxPage/></TabItem>
     <TabItem Header="DropDown"><pages:DropDownPage/></TabItem>
     <TabItem Header="Expander"><pages:ExpanderPage/></TabItem>
+    <TabItem Header="Image"><pages:ImagePage/></TabItem>
     <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
     <TabItem Header="Menu"><pages:MenuPage/></TabItem>
     <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/ImagePage.xaml b/samples/ControlCatalog/Pages/ImagePage.xaml
new file mode 100644
index 0000000000..a9c8846c6c
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ImagePage.xaml
@@ -0,0 +1,39 @@
+<UserControl xmlns="https://github.com/perspex">
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Classes="h1">Image</TextBlock>
+    <TextBlock Classes="h2">Displays an image</TextBlock>
+
+    <StackPanel Orientation="Horizontal"
+                Margin="0,16,0,0"
+                HorizontalAlignment="Center"
+                Gap="16">
+      <StackPanel Orientation="Vertical">
+        <TextBlock>No Stretch</TextBlock>
+        <Image Source="resm:ControlCatalog.Assets.delicate-arch-896885_640.jpg"
+               Width="100" Height="200"
+               Stretch="None"/>
+      </StackPanel>
+
+      <StackPanel Orientation="Vertical">
+        <TextBlock>Fill</TextBlock>
+        <Image Source="resm:ControlCatalog.Assets.delicate-arch-896885_640.jpg"
+               Width="100" Height="200"
+               Stretch="Fill"/>
+      </StackPanel>
+
+      <StackPanel Orientation="Vertical">
+        <TextBlock>Uniform</TextBlock>
+        <Image Source="resm:ControlCatalog.Assets.delicate-arch-896885_640.jpg"
+                Width="100" Height="200"
+                Stretch="Uniform"/>
+      </StackPanel>
+
+      <StackPanel Orientation="Vertical">
+        <TextBlock>UniformToFill</TextBlock>
+        <Image Source="resm:ControlCatalog.Assets.delicate-arch-896885_640.jpg"
+               Width="100" Height="200"
+               Stretch="UniformToFill"/>
+      </StackPanel>
+    </StackPanel>    
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/ImagePage.xaml.cs b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
new file mode 100644
index 0000000000..e80f92239a
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
@@ -0,0 +1,18 @@
+using Perspex.Controls;
+using Perspex.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class ImagePage : UserControl
+    {
+        public ImagePage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            PerspexXamlLoader.Load(this);
+        }
+    }
+}