fixed #557

src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml

@@ -8,7 +8,7 @@
         Width="320"
         Height="518">
     <hc:SimplePanel>
-        <Path Margin="0,36,0,0" VerticalAlignment="Top" Width="70" Height="70" Data="{StaticResource LogoGeometry}" Fill="#f06632"/>
+        <Path Margin="0,36,0,0" VerticalAlignment="Top" Width="70" Height="70" Data="{StaticResource LogoGeometry}" Fill="#f06632" Stretch="Uniform"/>
         <TextBlock Text="HandyControl" FontSize="30" Foreground="{StaticResource PrimaryBrush}" HorizontalAlignment="Center" Margin="0,122,0,0" VerticalAlignment="Top"/>
         <Button Command="hc:ControlCommands.CloseWindow" CommandParameter="{Binding RelativeSource={RelativeSource Self}}" Content="{hc:Lang Key={x:Static hc:LangKeys.Close}}" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="10,0,10,10"/>
     </hc:SimplePanel>

src/Shared/HandyControlDemo_Shared/UserControl/Main/AppSprite.xaml

@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <Border Background="White" CornerRadius="20" Effect="{StaticResource EffectShadow4}">
-        <Path Width="70" Height="70" Data="{StaticResource LogoGeometry}" Fill="#f06632"/>
+        <Path Width="70" Height="70" Data="{StaticResource LogoGeometry}" Fill="#f06632" Stretch="Uniform"/>
     </Border>
     <Button Command="hc:ControlCommands.CloseWindow" CommandParameter="{Binding RelativeSource={RelativeSource Self}}" Visibility="{Binding IsMouseOver,RelativeSource={RelativeSource AncestorType=hc:SimplePanel},Converter={StaticResource Boolean2VisibilityConverter}}" Width="22" Height="22" Style="{StaticResource ButtonIcon}" Foreground="White" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,-8,-8,0"/>
 </hc:SimplePanel>

src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.xaml

@@ -16,96 +16,96 @@
             <MenuItem Height="29" Header="{ex:Lang Key={x:Static langs:LangKeys.Repository}}">
                 <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://github.com/NaBian/HandyControl" Header="GitHub">
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource GithubGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                        <Path Data="{StaticResource GithubGeometry}" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform"/>
                     </MenuItem.Icon>
                 </MenuItem>
                 <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://www.nuget.org/packages/HandyControl" Header="NuGet">
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource NugetGeometry}" Fill="#30a5dd"/>
+                        <Path Data="{StaticResource NugetGeometry}" Fill="#30a5dd" Stretch="Uniform"/>
                     </MenuItem.Icon>
                 </MenuItem>
                 <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://marketplace.visualstudio.com/items?itemName=HandyOrg.handycontrolforvs2019" Header="{ex:Lang Key={x:Static langs:LangKeys.Vsix}}">
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource VisualStudioGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                        <Path Data="{StaticResource VisualStudioGeometry}" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform"/>
                     </MenuItem.Icon>
                 </MenuItem>
             </MenuItem>
             <MenuItem Height="29" Header="{ex:Lang Key={x:Static langs:LangKeys.About}}">
                 <MenuItem Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.ContributorsView}" Header="{ex:Lang Key={x:Static langs:LangKeys.Contributors}}">
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource ContributorsGeometry}" Fill="#ef6c00"/>
+                        <Path Data="{StaticResource ContributorsGeometry}" Fill="#ef6c00" Stretch="Uniform"/>
                     </MenuItem.Icon>
                 </MenuItem>
                 <MenuItem Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.QQGroupView}" Header="{ex:Lang Key={x:Static langs:LangKeys.QQGroup}}">
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource QqGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
+                        <Path Data="{StaticResource QqGeometry}" Fill="{DynamicResource PrimaryBrush}" Stretch="Uniform"/>
                     </MenuItem.Icon>
                 </MenuItem>
                 <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="mailto:836904362@qq.com" Header="{ex:Lang Key={x:Static langs:LangKeys.Email}}">
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource EmailGeometry}" Fill="{DynamicResource WarningBrush}"/>
+                        <Path Data="{StaticResource EmailGeometry}" Fill="{DynamicResource WarningBrush}" Stretch="Uniform"/>
                     </MenuItem.Icon>
                 </MenuItem>
                 <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://gitter.im/HandyControl/Lobby" Header="{ex:Lang Key={x:Static langs:LangKeys.Chatroom}}">
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource GitterGeometry}" Fill="#e52e64"/>
+                        <Path Data="{StaticResource GitterGeometry}" Fill="#e52e64" Stretch="Uniform"/>
                     </MenuItem.Icon>
                 </MenuItem>
                 <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://www.cnblogs.com/nabian" Header="{ex:Lang Key={x:Static langs:LangKeys.Blog}}">
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource CnblogsGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                        <Path Data="{StaticResource CnblogsGeometry}" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform"/>
                     </MenuItem.Icon>
                 </MenuItem>
                 <MenuItem Header="{ex:Lang Key={x:Static langs:LangKeys.Demo}}">
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource CodeGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                        <Path Data="{StaticResource CodeGeometry}" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform"/>
                     </MenuItem.Icon>
                     <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://github.com/AFei19911012/HandyControl" Header="AFei19911012 / HandyControl">
                         <MenuItem.Icon>
-                            <Path Data="{StaticResource CodeGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                            <Path Data="{StaticResource CodeGeometry}" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform"/>
                         </MenuItem.Icon>
                     </MenuItem>
                 </MenuItem>
                 <MenuItem Header="{ex:Lang Key={x:Static langs:LangKeys.Documentation}}">
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource DocGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
+                        <Path Data="{StaticResource DocGeometry}" Fill="{DynamicResource PrimaryBrush}" Stretch="Uniform"/>
                     </MenuItem.Icon>
                     <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://github.com/ghost1372/HandyControl/wiki/Documentation" Header="Wiki">
                         <MenuItem.Icon>
-                            <Path Data="{StaticResource WikiGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                            <Path Data="{StaticResource WikiGeometry}" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform"/>
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://ghost1372.github.io" Header="{ex:Lang Key={x:Static langs:LangKeys.Doc_en}}">
                         <MenuItem.Icon>
-                            <Path Data="{StaticResource LogoGeometry}" Fill="#ef6c00"/>
+                            <Path Data="{StaticResource LogoGeometry}" Fill="#ef6c00" Stretch="Uniform"/>
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem Command="hc:ControlCommands.OpenLink" CommandParameter="https://handyorg.github.io" Header="{ex:Lang Key={x:Static langs:LangKeys.Doc_cn}}">
                         <MenuItem.Icon>
-                            <Path Data="{StaticResource LogoGeometry}" Fill="#ef6c00"/>
+                            <Path Data="{StaticResource LogoGeometry}" Fill="#ef6c00" Stretch="Uniform"/>
                         </MenuItem.Icon>
                     </MenuItem>
                 </MenuItem>
                 <MenuItem Header="{ex:Lang Key={x:Static langs:LangKeys.About}}" Click="MenuAbout_OnClick">
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource InfoGeometry}" Fill="{DynamicResource SuccessBrush}"/>
+                        <Path Data="{StaticResource InfoGeometry}" Fill="{DynamicResource SuccessBrush}" Stretch="Uniform"/>
                     </MenuItem.Icon>
                 </MenuItem>
             </MenuItem>
             <MenuItem Height="29" Header="{ex:Lang Key={x:Static langs:LangKeys.Recommendation}}">
                 <MenuItem Header="{ex:Lang Key={x:Static langs:LangKeys.Project}}" Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.ProjectsView}" >
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource ProjectGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                        <Path Data="{StaticResource ProjectGeometry}" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform"/>
                     </MenuItem.Icon>
                 </MenuItem>
                 <MenuItem Header="{ex:Lang Key={x:Static langs:LangKeys.Blog}}" Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.BlogsView}" >
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource BlogGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
+                        <Path Data="{StaticResource BlogGeometry}" Fill="{DynamicResource PrimaryBrush}" Stretch="Uniform"/>
                     </MenuItem.Icon>
                 </MenuItem>
                 <MenuItem Header="{ex:Lang Key={x:Static langs:LangKeys.Website}}" Command="{Binding OpenViewCmd}" CommandParameter="{x:Static data:MessageToken.WebsitesView}" >
                     <MenuItem.Icon>
-                        <Path Data="{StaticResource WebsiteGeometry}" Fill="{DynamicResource WarningBrush}"/>
+                        <Path Data="{StaticResource WebsiteGeometry}" Fill="{DynamicResource WarningBrush}" Stretch="Uniform"/>
                     </MenuItem.Icon>
                 </MenuItem>
             </MenuItem>
@@ -166,4 +166,4 @@
             </StackPanel>
         </Border>
     </Popup>
-</Grid>
+</Grid>

src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml

@@ -1,10 +1,11 @@
-<UserControl x:Class="HandyControlDemo.UserControl.UnderConstruction"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:hc="https://handyorg.github.io/handycontrol"
-             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
-             Background="{DynamicResource RegionBrush}">
+<Border x:Class="HandyControlDemo.UserControl.UnderConstruction"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
+        xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+        xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
+        Background="{DynamicResource RegionBrush}"
+        CornerRadius="4">
     <hc:TransitioningContentControl>
        <StackPanel Margin="32">
             <hc:GifImage Width="400" Height="300">
@@ -15,4 +16,4 @@
            <TextBlock Margin="0,16,0,0" HorizontalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.ComingSoon}}" Style="{StaticResource TextBlockLargeBold}"/>
         </StackPanel>
     </hc:TransitioningContentControl>
-</UserControl>
+</Border>