Merge remote-tracking branch 'refs/remotes/origin/master' into style-initialized

samples/ControlCatalog/ControlCatalog.csproj

@@ -61,6 +61,15 @@
     <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>
+    <Compile Include="Pages\RadioButtonPage.xaml.cs">
+      <DependentUpon>RadioButtonPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\MenuPage.xaml.cs">
       <DependentUpon>MenuPage.xaml</DependentUpon>
     </Compile>
@@ -242,6 +251,21 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\RadioButtonPage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\ExpanderPage.xaml">
+      <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.

samples/ControlCatalog/MainWindow.xaml

@@ -11,8 +11,11 @@
     <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="Image"><pages:ImagePage/></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>

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>

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);
+        }
+    }
+}

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>

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);
+        }
+    }
+}

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>

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);
+        }
+    }
+}

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}"

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);

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>

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>

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}"