Merge pull request #32 from WPFDevelopersOrg/dev

Dev

Author: yanjinhuagood

src/WPFDevelopers.Shared/Styles/Styles.CheckBox.xaml

@@ -11,13 +11,17 @@
     <Style x:Key="DefaultCheckBox"  TargetType="{x:Type CheckBox}" BasedOn="{StaticResource ControlBasicStyle}">
         <!--<Setter Property="FocusVisualStyle" Value="{x:Null}" />-->
         <Setter Property="Padding" Value="4,0"/>
-        
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type CheckBox}">
-                    <BulletDecorator Background="Transparent">
+                    <BulletDecorator Background="Transparent"
+                                     Margin="{TemplateBinding Margin}">
                         <BulletDecorator.Bullet>
-                            <Border CornerRadius="{Binding ElementName=PART_Border,Path=CornerRadius}">
+                            <Border CornerRadius="{Binding ElementName=PART_Border,Path=CornerRadius}"
+                                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
                                 <Border x:Name="PART_Border" 
                                             Width="16" Height="16"
                                             CornerRadius="3"

src/WPFDevelopers.Shared/Styles/Styles.ListBox.xaml

@@ -14,10 +14,11 @@
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="MinWidth" Value="120" />
         <Setter Property="MinHeight" Value="95" />
+        <Setter Property="BorderThickness" Value="0,1,0,0"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBox}">
-                    <Border Name="Border"  BorderThickness="0,1,0,0" 
+                    <Border Name="Border"  BorderThickness="{TemplateBinding BorderThickness}" 
                             BorderBrush="{DynamicResource BaseSolidColorBrush}">
                         <ScrollViewer Focusable="False">
                             <VirtualizingStackPanel IsItemsHost="True" />

src/WPFDevelopers.Shared/Styles/Styles.RadioButton.xaml

@@ -13,26 +13,31 @@
         <Setter Property="Background" Value="{DynamicResource WindowForegroundColorBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Padding" Value="4,0"/>
-        
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RadioButton}">
-                    <BulletDecorator Background="Transparent">
+                    <BulletDecorator Background="Transparent"
+                                     Margin="{TemplateBinding Margin}">
                         <BulletDecorator.Bullet>
-                            <controls:SmallPanel MinWidth="16" MinHeight="16" >
-                                <Ellipse x:Name="PART_Border" 
+                            <Border VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
+                                <controls:SmallPanel MinWidth="16" MinHeight="16" >
+                                    <Ellipse x:Name="PART_Border" 
                                          StrokeThickness="{TemplateBinding BorderThickness}"
                                          Fill="{TemplateBinding Background}" 
                                          Stroke="{DynamicResource BaseSolidColorBrush}">
-                                </Ellipse>
-                                <Ellipse x:Name="PART_Ellipse" Fill="{DynamicResource WindowForegroundColorBrush}" 
+                                    </Ellipse>
+                                    <Ellipse x:Name="PART_Ellipse" Fill="{DynamicResource WindowForegroundColorBrush}" 
                                          MinWidth="6" MinHeight="6"
                                          RenderTransformOrigin=".5,.5">
-                                    <Ellipse.RenderTransform>
-                                        <ScaleTransform ScaleX="0" ScaleY="0"/>
-                                    </Ellipse.RenderTransform>
-                                </Ellipse>
-                            </controls:SmallPanel>
+                                        <Ellipse.RenderTransform>
+                                            <ScaleTransform ScaleX="0" ScaleY="0"/>
+                                        </Ellipse.RenderTransform>
+                                    </Ellipse>
+                                </controls:SmallPanel>
+                            </Border>
                         </BulletDecorator.Bullet>
                         <ContentPresenter x:Name="PART_ContentPresenter" 
                                           ContentTemplate="{TemplateBinding ContentTemplate}"