From 0fd452ca2fdf767dbc5acf54ee50b74e5b645cd2 Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Tue, 4 Dec 2018 15:13:55 +0330
Subject: [PATCH] fixed Demo

---
 HandyControl/Themes/Styles/Expander.xaml      | 295 +++++++++++++++++-
 .../Styles/RadioButtonDemoCtl.xaml            |  63 +++-
 2 files changed, 345 insertions(+), 13 deletions(-)

diff --git a/HandyControl/Themes/Styles/Expander.xaml b/HandyControl/Themes/Styles/Expander.xaml
index e02c0427..17b30f60 100644
--- a/HandyControl/Themes/Styles/Expander.xaml
+++ b/HandyControl/Themes/Styles/Expander.xaml
@@ -401,5 +401,298 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
+
+    <Style x:Key="NoExpander" TargetType="{x:Type Expander}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Expander}">
+                    <Border SnapsToDevicePixels="True">
+                        <DockPanel>
+                            <ToggleButton
+                                x:Name="HeaderSite"
+                                MinWidth="0"
+                                IsEnabled="False"
+                                MinHeight="0"
+                                FocusVisualStyle="{x:Null}"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Header}"
+                                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                DockPanel.Dock="Top"
+                                FontFamily="{TemplateBinding FontFamily}"
+                                FontSize="{TemplateBinding FontSize}"
+                                FontStretch="{TemplateBinding FontStretch}"
+                                FontStyle="{TemplateBinding FontStyle}"
+                                FontWeight="{TemplateBinding FontWeight}"
+                                Foreground="{TemplateBinding Foreground}"
+                                Style="{StaticResource ToggleButtonExpanderStyle}"
+                                IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
+                            </ToggleButton>
+                            <ContentPresenter
+                                x:Name="ExpandSite"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                DockPanel.Dock="Bottom"
+                                Focusable="False"
+                                Visibility="Collapsed" />
+                        </DockPanel>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="True">
+                            <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="ExpandDirection" Value="Right">
+                            <Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Right" />
+                            <Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Left" />
+                            <Setter TargetName="HeaderSite" Property="Style">
+                                <Setter.Value>
+                                    <Style TargetType="{x:Type ToggleButton}">
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                                                    <Border Padding="{TemplateBinding Padding}">
+                                                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                                                            <Grid.RowDefinitions>
+                                                                <RowDefinition Height="19" />
+                                                                <RowDefinition Height="*" />
+                                                            </Grid.RowDefinitions>
+                                                            <Grid>
+                                                                <Grid.LayoutTransform>
+                                                                    <TransformGroup>
+                                                                        <RotateTransform Angle="-90" />
+                                                                    </TransformGroup>
+                                                                </Grid.LayoutTransform>
+                                                                <Ellipse
+                                                                    x:Name="circle"
+                                                                    Width="19"
+                                                                    Height="19"
+                                                                    HorizontalAlignment="Center"
+                                                                    VerticalAlignment="Center"
+                                                                    Fill="White"
+                                                                    Stroke="#FF333333" />
+                                                                <Path
+                                                                    x:Name="arrow"
+                                                                    HorizontalAlignment="Center"
+                                                                    VerticalAlignment="Center"
+                                                                    Data="M1,1.5L4.5,5 8,1.5"
+                                                                    SnapsToDevicePixels="False"
+                                                                    Stroke="#FF333333"
+                                                                    StrokeThickness="2" />
+                                                            </Grid>
+                                                            <ContentPresenter
+                                                                Grid.Row="1"
+                                                                Margin="0,4,0,0"
+                                                                HorizontalAlignment="Center"
+                                                                VerticalAlignment="Top"
+                                                                Content="{TemplateBinding Content}"
+                                                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                                RecognizesAccessKey="True"
+                                                                SnapsToDevicePixels="True" />
+                                                        </Grid>
+                                                    </Border>
+                                                    <ControlTemplate.Triggers>
+                                                        <Trigger Property="IsChecked" Value="True">
+                                                            <Setter TargetName="arrow" Property="Data" Value="M1,4.5L4.5,1 8,4.5" />
+                                                        </Trigger>
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter TargetName="circle" Property="Stroke" Value="#FF5593FF" />
+                                                            <Setter TargetName="circle" Property="Fill" Value="#FFF3F9FF" />
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="Black" />
+                                                        </Trigger>
+                                                        <Trigger Property="IsPressed" Value="True">
+                                                            <Setter TargetName="circle" Property="Stroke" Value="#FF3C77DD" />
+                                                            <Setter TargetName="circle" Property="StrokeThickness" Value="1.5" />
+                                                            <Setter TargetName="circle" Property="Fill" Value="#FFD9ECFF" />
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="Black" />
+                                                        </Trigger>
+                                                        <Trigger Property="IsEnabled" Value="False">
+                                                            <Setter TargetName="circle" Property="Stroke" Value="#FFBCBCBC" />
+                                                            <Setter TargetName="circle" Property="Fill" Value="#FFE6E6E6" />
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="#FF707070" />
+                                                        </Trigger>
+                                                    </ControlTemplate.Triggers>
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="ExpandDirection" Value="Up">
+                            <Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Top" />
+                            <Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Bottom" />
+                            <Setter TargetName="HeaderSite" Property="Style">
+                                <Setter.Value>
+                                    <Style TargetType="{x:Type ToggleButton}">
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                                                    <Border Padding="{TemplateBinding Padding}">
+                                                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="19" />
+                                                                <ColumnDefinition Width="*" />
+                                                            </Grid.ColumnDefinitions>
+                                                            <Grid>
+                                                                <Grid.LayoutTransform>
+                                                                    <TransformGroup>
+                                                                        <RotateTransform Angle="180" />
+                                                                    </TransformGroup>
+                                                                </Grid.LayoutTransform>
+                                                                <Ellipse
+                                                                    x:Name="circle"
+                                                                    Width="19"
+                                                                    Height="19"
+                                                                    HorizontalAlignment="Center"
+                                                                    VerticalAlignment="Center"
+                                                                    Fill="White"
+                                                                    Stroke="#FF333333" />
+                                                                <Path
+                                                                    x:Name="arrow"
+                                                                    HorizontalAlignment="Center"
+                                                                    VerticalAlignment="Center"
+                                                                    Data="M1,1.5L4.5,5 8,1.5"
+                                                                    SnapsToDevicePixels="False"
+                                                                    Stroke="#FF333333"
+                                                                    StrokeThickness="2" />
+                                                            </Grid>
+                                                            <ContentPresenter
+                                                                Grid.Column="1"
+                                                                Margin="4,0,0,0"
+                                                                HorizontalAlignment="Left"
+                                                                VerticalAlignment="Center"
+                                                                Content="{TemplateBinding Content}"
+                                                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                                RecognizesAccessKey="True"
+                                                                SnapsToDevicePixels="True" />
+                                                        </Grid>
+                                                    </Border>
+                                                    <ControlTemplate.Triggers>
+                                                        <Trigger Property="IsChecked" Value="True">
+                                                            <Setter TargetName="arrow" Property="Data" Value="M1,4.5L4.5,1 8,4.5" />
+                                                        </Trigger>
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter TargetName="circle" Property="Stroke" Value="#FF5593FF" />
+                                                            <Setter TargetName="circle" Property="Fill" Value="#FFF3F9FF" />
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="Black" />
+                                                        </Trigger>
+                                                        <Trigger Property="IsPressed" Value="True">
+                                                            <Setter TargetName="circle" Property="Stroke" Value="#FF3C77DD" />
+                                                            <Setter TargetName="circle" Property="StrokeThickness" Value="1.5" />
+                                                            <Setter TargetName="circle" Property="Fill" Value="#FFD9ECFF" />
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="Black" />
+                                                        </Trigger>
+                                                        <Trigger Property="IsEnabled" Value="False">
+                                                            <Setter TargetName="circle" Property="Stroke" Value="#FFBCBCBC" />
+                                                            <Setter TargetName="circle" Property="Fill" Value="#FFE6E6E6" />
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="#FF707070" />
+                                                        </Trigger>
+                                                    </ControlTemplate.Triggers>
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="ExpandDirection" Value="Left">
+                            <Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Left" />
+                            <Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Right" />
+                            <Setter TargetName="HeaderSite" Property="Style">
+                                <Setter.Value>
+                                    <Style TargetType="{x:Type ToggleButton}">
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                                                    <Border Padding="{TemplateBinding Padding}">
+                                                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                                                            <Grid.RowDefinitions>
+                                                                <RowDefinition Height="19" />
+                                                                <RowDefinition Height="*" />
+                                                            </Grid.RowDefinitions>
+                                                            <Grid>
+                                                                <Grid.LayoutTransform>
+                                                                    <TransformGroup>
+                                                                        <RotateTransform Angle="90" />
+                                                                    </TransformGroup>
+                                                                </Grid.LayoutTransform>
+                                                                <Ellipse
+                                                                    x:Name="circle"
+                                                                    Width="19"
+                                                                    Height="19"
+                                                                    HorizontalAlignment="Center"
+                                                                    VerticalAlignment="Center"
+                                                                    Fill="White"
+                                                                    Stroke="#FF333333" />
+                                                                <Path
+                                                                    x:Name="arrow"
+                                                                    HorizontalAlignment="Center"
+                                                                    VerticalAlignment="Center"
+                                                                    Data="M1,1.5L4.5,5 8,1.5"
+                                                                    SnapsToDevicePixels="False"
+                                                                    Stroke="#FF333333"
+                                                                    StrokeThickness="2" />
+                                                            </Grid>
+                                                            <ContentPresenter
+                                                                Grid.Row="1"
+                                                                Margin="0,4,0,0"
+                                                                HorizontalAlignment="Center"
+                                                                VerticalAlignment="Top"
+                                                                Content="{TemplateBinding Content}"
+                                                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                                RecognizesAccessKey="True"
+                                                                SnapsToDevicePixels="True" />
+                                                        </Grid>
+                                                    </Border>
+                                                    <ControlTemplate.Triggers>
+                                                        <Trigger Property="IsChecked" Value="True">
+                                                            <Setter TargetName="arrow" Property="Data" Value="M1,4.5L4.5,1 8,4.5" />
+                                                        </Trigger>
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter TargetName="circle" Property="Stroke" Value="#FF5593FF" />
+                                                            <Setter TargetName="circle" Property="Fill" Value="#FFF3F9FF" />
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="Black" />
+                                                        </Trigger>
+                                                        <Trigger Property="IsPressed" Value="True">
+                                                            <Setter TargetName="circle" Property="Stroke" Value="#FF3C77DD" />
+                                                            <Setter TargetName="circle" Property="StrokeThickness" Value="1.5" />
+                                                            <Setter TargetName="circle" Property="Fill" Value="#FFD9ECFF" />
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="Black" />
+                                                        </Trigger>
+                                                        <Trigger Property="IsEnabled" Value="False">
+                                                            <Setter TargetName="circle" Property="Stroke" Value="#FFBCBCBC" />
+                                                            <Setter TargetName="circle" Property="Fill" Value="#FFE6E6E6" />
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="#FF707070" />
+                                                        </Trigger>
+                                                    </ControlTemplate.Triggers>
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml
index b36fdfe1..9b88c9b4 100644
--- a/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml
@@ -17,18 +17,57 @@
             </GroupBox>
             <GroupBox Background="Transparent" Margin="10" Header="List Style">
                 <StackPanel Margin="32" HorizontalAlignment="Center" VerticalAlignment="Center">
-                    <controls:ImageRadioButton IsChecked="True" SideBrush="{DynamicResource SuccessBrush}"  Content="{x:Static langs:Lang.RadioButton}"/>
-                    <controls:ImageRadioButton Margin="0,16,0,0" SideBrush="{DynamicResource WarningBrush}"  Content="{x:Static langs:Lang.RadioButton}"/>
-                    <controls:ImageRadioButton Margin="0,16,0,0" Content="{x:Static langs:Lang.RadioButton}"/>
-                    <controls:ImageRadioButton Margin="0,16,0,0" Content="{x:Static langs:Lang.RadioButton}"/>
-                    <Expander Header="SubMenu with Image" Style="{StaticResource ExpanderListStyle}">
-                        <StackPanel>
-                            <controls:ImageRadioButton Image="{DynamicResource WindowsGeometry}" SideBrush="{DynamicResource SuccessBrush}"  Content="{x:Static langs:Lang.RadioButton}"/>
-                            <controls:ImageRadioButton Image="{DynamicResource CalendarGeometry}" IsChecked="True" Margin="0,16,0,0" SideBrush="{DynamicResource WarningBrush}"  Content="{x:Static langs:Lang.RadioButton}"/>
-                            <controls:ImageRadioButton Image="{DynamicResource ContributorsGeometry}" Margin="0,16,0,0" Content="{x:Static langs:Lang.RadioButton}"/>
-                            <controls:ImageRadioButton Image="{DynamicResource EmailGeometry}" Margin="0,16,0,0" Content="{x:Static langs:Lang.RadioButton}"/>
-                        </StackPanel>
-                    </Expander>
+                    <StackPanel>
+                        <Expander
+                            Header="Select Item"
+                            IsExpanded="True"
+                            Style="{StaticResource NoExpander}">
+                            <StackPanel>
+                                <controls:ImageRadioButton
+                                    Content="Radio Button1"
+                                    GroupName="Menu"
+                                    SideBrush="{DynamicResource DangerBrush}"
+                                    Image="{DynamicResource WindowsGeometry}"
+                                    IsChecked="True" />
+                                <controls:ImageRadioButton
+                                    Content="Radio Button2"
+                                    GroupName="Menu"
+                                    Image="{DynamicResource ContributorsGeometry}"
+                                    ImageHeight="14"
+                                    ImageWidth="18"/>
+                                <controls:ImageRadioButton
+                                    Content="Radio Button3"
+                                    GroupName="Menu"
+                                    Image="{DynamicResource CalendarGeometry}"
+                                    ImageHeight="12"
+                                    ImageWidth="18"/>
+                                <controls:ImageRadioButton
+                                    Content="Radio Button4"
+                                    GroupName="Menu"
+                                    Image="{DynamicResource AllGeometry}"
+                                    ImageWidth="20"/>
+                            </StackPanel>
+                        </Expander>
+                        <Expander
+                            Margin="0,10,0,0"
+                            Header="Sub Items"
+                            IsExpanded="True"
+                            Style="{StaticResource ExpanderListStyle}">
+                            <StackPanel>
+                                <controls:ImageRadioButton
+                                    Content="Radio Button5"
+                                    GroupName="Menu"
+                                    Image="{DynamicResource CnblogsGeometry}"
+                                    ImageWidth="14"/>
+                                <controls:ImageRadioButton
+                                    Content="Radio Button6"
+                                    GroupName="Menu"
+                                    Image="{DynamicResource DownloadGeometry}"
+                                    ImageHeight="16"
+                                    ImageWidth="16"/>
+                            </StackPanel>
+                        </Expander>
+                    </StackPanel>
                 </StackPanel>
             </GroupBox>
         </StackPanel>