fixed #557

src/Shared/HandyControl_Shared/HandyControl_Shared.projitems

@@ -406,6 +406,7 @@
     <None Include="$(MSBuildThisFileDirectory)Themes\Basic\Brushes.xaml">
       <SubType>Designer</SubType>
     </None>
+    <None Include="$(MSBuildThisFileDirectory)Themes\XamlCombine.exe" />
     <Page Include="$(MSBuildThisFileDirectory)Themes\Basic\Colors\Colors.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -790,9 +791,6 @@
     <None Include="$(MSBuildThisFileDirectory)Themes\Styles\GroupBox.xaml">
       <SubType>Designer</SubType>
     </None>
-    <None Include="$(MSBuildThisFileDirectory)Themes\Styles\Image.xaml">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="$(MSBuildThisFileDirectory)Themes\Styles\ImageViewer.xaml">
       <SubType>Designer</SubType>
     </None>
@@ -1005,4 +1003,8 @@
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.WatermarkTextBox.icon.bmp" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Icons\HandyControl.Controls.WaveProgressBar.icon.bmp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)Themes\Theme_40.txt" />
+    <None Include="$(MSBuildThisFileDirectory)Themes\Theme_GE45.txt" />
+  </ItemGroup>
 </Project>

src/Shared/HandyControl_Shared/Themes/Basic/Paths.xaml

@@ -6,10 +6,6 @@
         <themes:SharedResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Basic/Geometries.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Style TargetType="Path">
-        <Setter Property="Stretch" Value="Uniform"/>
-    </Style>
-
     <Style x:Key="PathBaseStyle" TargetType="Path">
         <Setter Property="Stretch" Value="Uniform"/>
         <Setter Property="SnapsToDevicePixels" Value="True"/>
@@ -112,4 +108,4 @@
         <Setter Property="Data" Value="{StaticResource UpDownGeometry}"/>
     </Style>
 
-</ResourceDictionary>
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml

@@ -23,7 +23,7 @@
                 <ControlTemplate TargetType="ToggleButton">
                     <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
                         <Border Margin="0,0,6,0" BorderThickness="1" BorderBrush="Transparent" HorizontalAlignment="Right" SnapsToDevicePixels="true" Width="{StaticResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                            <Path Width="16" Height="9" x:Name="arrow" Data="{StaticResource DownGeometry}" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            <Path Width="16" Height="9" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         </Border>
                     </Border>
                     <ControlTemplate.Triggers>

src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml

@@ -34,7 +34,7 @@
                                         <ColumnDefinition Width="32"/>
                                     </Grid.ColumnDefinitions>
                                     <ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                                    <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Fill="{TemplateBinding Foreground}" Data="{StaticResource DownGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right"/>
+                                    <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource DownGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right"/>
                                 </Grid>
                             </ToggleButton>
                         </Border>
@@ -55,4 +55,4 @@
         </Setter>
     </Style>
 
-</ResourceDictionary>
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Base/MenuBaseStyle.xaml

@@ -214,4 +214,4 @@
         </Setter>
     </Style>
 
-</ResourceDictionary>
+</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Styles/Image.xaml

@@ -1,8 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-
-    <Style TargetType="Image">
-        <Setter Property="Stretch" Value="Uniform" />
-        <Setter Property="RenderOptions.BitmapScalingMode" Value="NearestNeighbor" />
-    </Style>
-
-</ResourceDictionary>

src/Shared/HandyControl_Shared/Themes/Theme_40.txt

@@ -1,4 +1,4 @@
-# --------------------------------------
+# --------------------------------------
 Lang.xaml
 # --------------------------------------
 Basic\Brushes.xaml
@@ -17,7 +17,6 @@ Styles\ContentControl.xaml
 Styles\FlipClock.xaml
 Styles\FloatingBlock.xaml
 Styles\GridSplitter.xaml
-Styles\Image.xaml
 Styles\Notification.xaml
 Styles\Rectangle.xaml
 Styles\RichTextBox.xaml
@@ -144,7 +143,6 @@ Styles\GotoTop.xaml
 Styles\Gravatar.xaml
 Styles\GridSplitter.xaml
 Styles\Growl.xaml
-Styles\Image.xaml
 Styles\ImageSelector.xaml
 Styles\ImageViewer.xaml
 Styles\ListBox.xaml
@@ -182,4 +180,4 @@ Styles\ToolTip.xaml
 Styles\Transfer.xaml
 Styles\TransitioningContentControl.xaml
 Styles\TreeView.xaml
-Styles\Watermark.xaml
+Styles\Watermark.xaml

src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt

@@ -1,4 +1,4 @@
-# --------------------------------------
+# --------------------------------------
 Lang.xaml
 # --------------------------------------
 Basic\Brushes.xaml
@@ -17,7 +17,6 @@ Styles\ContentControl.xaml
 Styles\FlipClock.xaml
 Styles\FloatingBlock.xaml
 Styles\GridSplitter.xaml
-Styles\Image.xaml
 Styles\Notification.xaml
 Styles\Rectangle.xaml
 Styles\RichTextBox.xaml
@@ -144,7 +143,6 @@ Styles\GotoTop.xaml
 Styles\Gravatar.xaml
 Styles\GridSplitter.xaml
 Styles\Growl.xaml
-Styles\Image.xaml
 Styles\ImageSelector.xaml
 Styles\ImageViewer.xaml
 Styles\ListBox.xaml
@@ -182,4 +180,4 @@ Styles\ToolTip.xaml
 Styles\Transfer.xaml
 Styles\TransitioningContentControl.xaml
 Styles\TreeView.xaml
-Styles\Watermark.xaml
+Styles\Watermark.xaml

src/Shared/HandyControl_Shared/Tools/Generator/GithubGravatarGenerator.cs

@@ -54,7 +54,8 @@ namespace HandyControl.Tools
             {
                 Data = geometryGroup,
                 Fill = renderBrush,
-                VerticalAlignment = VerticalAlignment.Top
+                VerticalAlignment = VerticalAlignment.Top,
+                Stretch = Stretch.Uniform
             };
 
             RenderOptions.SetEdgeMode(path, EdgeMode.Aliased);