1

src/YSAI.DAQ/YSAI.Window/Themes/Style/ButtonStyle.xaml

@@ -422,7 +422,6 @@
                         </GradientStopCollection>
                     </LinearGradientBrush.GradientStops>
                 </LinearGradientBrush>
-
             </Border.BorderBrush>
             <Border.Background>
                 <LinearGradientBrush EndPoint="0,0" StartPoint="0,0">

src/YSAI.DAQ/YSAI.Window/Themes/Style/WindowStyle.xaml

@@ -52,37 +52,37 @@
                                     <!--标题-->
                                     <Label Name="CaptionText" Grid.Column="1"  Content="{Binding Path=Title, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" HorizontalAlignment="{DynamicResource TitleHorizontalAlignment}"  Foreground="{DynamicResource TitleForeground}" FontWeight="{DynamicResource TitleFontWeight}" FontSize="{DynamicResource TitleFontSize}" />
                                     <!--语言-->
-                                    <Button  Grid.Column="2"  BorderThickness="0"  Template="{DynamicResource LanguageCaptionButtonStyle}" Width="30" Name="PART_LanguageButton" WindowChrome.IsHitTestVisibleInChrome="True">
+                                    <Button  Grid.Column="2"  BorderThickness="0"  BorderBrush="Red" Template="{DynamicResource LanguageCaptionButtonStyle}" Width="30" Name="PART_LanguageButton" WindowChrome.IsHitTestVisibleInChrome="True">
                                         <StackPanel Orientation="Horizontal">
                                             <Image  Source="{DynamicResource Language}" Width="{DynamicResource LanguageImageWidth}" Stretch="Uniform"/>
                                         </StackPanel>
                                     </Button>
                                     <!--皮肤-->
-                                    <Button  Grid.Column="3"  BorderThickness="0"  Template="{DynamicResource SkinCaptionButtonStyle}" Width="30" Height="auto" Name="PART_SkinButton" WindowChrome.IsHitTestVisibleInChrome="True">
+                                    <Button  Grid.Column="3" Template="{DynamicResource SkinCaptionButtonStyle}" Width="30" Height="auto" Name="PART_SkinButton" WindowChrome.IsHitTestVisibleInChrome="True">
                                         <StackPanel Orientation="Horizontal">
                                             <Image  Source="{DynamicResource Skin}" Width="{DynamicResource SkinImageWidth}" Stretch="Uniform" />
                                         </StackPanel>
                                     </Button>
                                     <!--最小化-->
-                                    <Button  Grid.Column="4"  BorderThickness="0"  Template="{DynamicResource MinCaptionButtonStyle}"  Name="PART_MinimizeButton" Height="auto" Width="40" WindowChrome.IsHitTestVisibleInChrome="True">
+                                    <Button  Grid.Column="4" Template="{DynamicResource MinCaptionButtonStyle}"  Name="PART_MinimizeButton" Height="auto" Width="40" WindowChrome.IsHitTestVisibleInChrome="True">
                                         <StackPanel Orientation="Horizontal">
                                             <Image  Source="{DynamicResource Min}" Width="{DynamicResource MinimizeImageWidth}" Stretch="Uniform"/>
                                         </StackPanel>
                                     </Button>
                                     <!--原始-->
-                                    <Button  Grid.Column="5"  BorderThickness="0" Template="{DynamicResource NormalCaptionButtonStyle}" Name="PART_NormalButton" Height="auto" Width="40" WindowChrome.IsHitTestVisibleInChrome="True">
+                                    <Button  Grid.Column="5" Template="{DynamicResource NormalCaptionButtonStyle}" Name="PART_NormalButton" Height="auto" Width="40" WindowChrome.IsHitTestVisibleInChrome="True">
                                         <StackPanel Orientation="Horizontal" >
                                             <Image Source="{DynamicResource Normal}" Width="{DynamicResource NormalImageWidth}" Stretch="Uniform"/>
                                         </StackPanel>
                                     </Button>
                                     <!--最大化-->
-                                    <Button  Grid.Column="5"  BorderThickness="0" Template="{DynamicResource MaxCaptionButtonStyle}" Name="PART_MaximizeButton" Height="auto" Width="40" WindowChrome.IsHitTestVisibleInChrome="True">
+                                    <Button  Grid.Column="5" Template="{DynamicResource MaxCaptionButtonStyle}" Name="PART_MaximizeButton" Height="auto" Width="40" WindowChrome.IsHitTestVisibleInChrome="True">
                                         <StackPanel Orientation="Horizontal" >
                                             <Image Source="{DynamicResource Max}" Width="{DynamicResource MaximizeImageWidth}" Stretch="Uniform"/>
                                         </StackPanel>
                                     </Button>
                                     <!--关闭-->
-                                    <Button  Grid.Column="6" Background="{x:Null}" BorderThickness="0" Template="{DynamicResource CloseCaptionButtonStyle}" Name="PART_CloseButton"  Height="auto" Width="40" WindowChrome.IsHitTestVisibleInChrome="True">
+                                    <Button  Grid.Column="6" Background="{x:Null}" Template="{DynamicResource CloseCaptionButtonStyle}" Name="PART_CloseButton"  Height="auto" Width="40" WindowChrome.IsHitTestVisibleInChrome="True">
                                         <StackPanel Orientation="Horizontal">
                                             <Image  Source="{DynamicResource Close}" Width="{DynamicResource CloseImageWidth}" Stretch="Uniform"/>
                                         </StackPanel>