dev pull requese master

src/WPFDevelopers.Net40/Window.cs

@@ -1,11 +1,10 @@
-using System;
+using Microsoft.Windows.Shell;
+using System;
 using System.Runtime.InteropServices;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
-using Microsoft.Windows.Shell;
 using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Net40
@@ -23,6 +22,9 @@ public class Window : System.Windows.Window
         public static readonly DependencyProperty TitleBarProperty =
             DependencyProperty.Register("TitleBar", typeof(object), typeof(Window), new PropertyMetadata(null));
 
+        public static readonly DependencyProperty TitleBackgroundProperty =
+           DependencyProperty.Register("TitleBackground", typeof(Brush), typeof(Window), new PropertyMetadata(ControlsHelper.PrimaryNormalBrush));
+
         static Window()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata(typeof(Window)));
@@ -63,6 +65,12 @@ public object TitleBar
             set => SetValue(TitleBarProperty, value);
         }
 
+        public Brush TitleBackground
+        {
+            get => (Brush)GetValue(TitleBarProperty);
+            set => SetValue(TitleBarProperty, value);
+        }
+
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             hWnd = new WindowInteropHelper(this).Handle;
@@ -142,7 +150,6 @@ private IntPtr WindowProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, re
                     handled = true;
                 }
             }
-
             return IntPtr.Zero;
         }
 

src/WPFDevelopers.Net45x/Window.cs

@@ -3,6 +3,7 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
+using System.Windows.Media;
 using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Net45x
@@ -20,6 +21,9 @@ public class Window : System.Windows.Window
         public static readonly DependencyProperty TitleBarProperty =
             DependencyProperty.Register("TitleBar", typeof(object), typeof(Window), new PropertyMetadata(null));
 
+        public static readonly DependencyProperty TitleBackgroundProperty =
+          DependencyProperty.Register("TitleBackground", typeof(Brush), typeof(Window), new PropertyMetadata(ControlsHelper.PrimaryNormalBrush));
+
         static Window()
         {
             StyleProperty.OverrideMetadata(typeof(Window),
@@ -57,6 +61,12 @@ public object TitleBar
             get => (object)GetValue(TitleBarProperty);
             set => SetValue(TitleBarProperty, value);
         }
+        public Brush TitleBackground
+        {
+            get => (Brush)GetValue(TitleBarProperty);
+            set => SetValue(TitleBarProperty, value);
+        }
+
         private static T GetResourceKey<T>(string key)
         {
             if (Application.Current.TryFindResource(key) is T resource) return resource;

src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/CodeViewer.cs

@@ -30,6 +30,8 @@ public override void OnApplyTemplate()
             foreach (var item in SourceCodes)
             {
                 var tabItem = CreateTabItem(item);
+                tabItem.Height = 38;
+                tabItem.Padding = new Thickness(20,0,20,0);
                 _tabControl.Items.Add(tabItem);
             }
         }

src/WPFDevelopers.Samples.Shared/Controls/CodeViewer/CodeViewer.xaml

@@ -15,6 +15,8 @@
                         </TabControl.Resources>
                         <TabItem
                             x:Name="PART_TabItemContent"
+                            Height="38"
+                            Padding="20,0"
                             Content="{TemplateBinding Content}"
                             Header="Sample" />
 

src/WPFDevelopers.Samples.Shared/ExampleViews/AboutWindow.xaml

@@ -1,86 +1,114 @@
-<Window x:Class="WPFDevelopers.Samples.ExampleViews.AboutWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:ws="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-        mc:Ignorable="d" WindowStartupLocation="CenterScreen"
-        SnapsToDevicePixels="True" WindowStyle="None"
-        TextOptions.TextFormattingMode="Display"
-        ResizeMode="NoResize" 
-        Height="400" Width="300" 
-        Background="{DynamicResource WD.BackgroundSolidColorBrush}"
-        Title="关于" >
+<wd:Window
+    x:Class="WPFDevelopers.Samples.ExampleViews.AboutWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    Title="关于"
+    Width="300"
+    Height="400"
+    BorderBrush="Transparent"
+    BorderThickness="0"
+    NoChrome="True"
+    ResizeMode="NoResize"
+    TitleBackground="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"
+    TitleHeight="30"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="ToolWindow"
+    mc:Ignorable="d">
+    <wd:Window.TitleBar>
+        <Grid Height="30" VerticalAlignment="Center">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" MinWidth="30" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Margin="10,0"
+                VerticalAlignment="Center"
+                FontSize="14"
+                Foreground="{DynamicResource WD.WindowForegroundColorBrush}"
+                IsHitTestVisible="False"
+                Text="关于" />
+            <Button
+                x:Name="CloseButton"
+                Grid.Column="2"
+                Width="25"
+                Height="25"
+                Margin="0,2,4,0"
+                HorizontalAlignment="Right"
+                wd:ElementHelper.IsRound="True"
+                Click="CloseButton_Click"
+                Style="{StaticResource WD.NormalButton}"
+                ToolTip="关闭">
+                <wd:PathIcon
+                    Width="10"
+                    Height="10"
+                    Foreground="{DynamicResource WD.WindowForegroundColorBrush}"
+                    Kind="WindowClose" />
+            </Button>
+        </Grid>
+    </wd:Window.TitleBar>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="4*"/>
-            <RowDefinition Height="6*"/>
+            <RowDefinition Height="4*" />
+            <RowDefinition Height="6*" />
         </Grid.RowDefinitions>
-        <Rectangle Fill="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"/>
-        <TextBlock Text="关于" 
-                   Foreground="{DynamicResource WD.WindowForegroundColorBrush}"
-                   Margin="10,4"/>
-
+        <Rectangle Fill="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
         <Rectangle Width="120">
             <Rectangle.Fill>
-                <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/WPFDevelopers.ico" Stretch="Uniform"/>
+                <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/WPFDevelopers.ico" Stretch="Uniform" />
             </Rectangle.Fill>
         </Rectangle>
-        <Button x:Name="CloseButton" Width="30" Height="30" 
-                HorizontalAlignment="Right" 
-                VerticalAlignment="Top"
-                Style="{StaticResource WD.WindowButtonStyle}" 
-                ToolTip="关闭"
-                Click="CloseButton_Click">
-            <Path Data="{StaticResource WD.WindowCloseGeometry}"
-                  Fill="{DynamicResource WD.WindowForegroundColorBrush}"
-                  Height="10"
-                  Width="10"
-                  Stretch="UniformToFill"/>
-        </Button>
+
         <Grid Grid.Row="1" Margin="0,10">
             <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <TextBlock Text="WPFDevelopers" FontSize="20" 
-                                   HorizontalAlignment="Center"
-                       VerticalAlignment="Bottom"
-                                   Padding="0,4"/>
-            <TextBlock Text="微信号公众号:WPFDevelopers" 
-                                   HorizontalAlignment="Center"
-                       VerticalAlignment="Top"
-                                   Padding="0,4"
-                       Grid.Row="1"/>
-            <TextBlock FontSize="11" 
-                       HorizontalAlignment="Center" 
-                       VerticalAlignment="Bottom"
-                       Foreground="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
-                       Grid.Row="2">
-            <Hyperlink NavigateUri="https://github.com/yanjinhuagood/WPFDevelopers.git"
-                       RequestNavigate="GithubHyperlink_RequestNavigate"> Github 源码</Hyperlink>
-            <Run/>
-            <Run/>
-            <Run/>
-            <Hyperlink NavigateUri="https://gitee.com/WPFDevelopersOrg/WPFDevelopers.git"
-                      RequestNavigate="GiteeHyperlink_RequestNavigate"> 码云源码</Hyperlink>
+            <TextBlock
+                Padding="0,4"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Bottom"
+                FontSize="20"
+                Text="WPFDevelopers" />
+            <TextBlock
+                Grid.Row="1"
+                Padding="0,4"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Top"
+                Text="微信号公众号:WPFDevelopers" />
+            <TextBlock
+                Grid.Row="2"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Bottom"
+                FontSize="11"
+                Foreground="{DynamicResource WD.PrimaryNormalSolidColorBrush}">
+                <Hyperlink NavigateUri="https://github.com/yanjinhuagood/WPFDevelopers.git" RequestNavigate="GithubHyperlink_RequestNavigate">Github 源码</Hyperlink>
+                <Run />
+                <Run />
+                <Run />
+                <Hyperlink NavigateUri="https://gitee.com/WPFDevelopersOrg/WPFDevelopers.git" RequestNavigate="GiteeHyperlink_RequestNavigate">码云源码</Hyperlink>
 
             </TextBlock>
-            <TextBlock FontSize="11" 
-                       HorizontalAlignment="Center"
-                       Grid.Row="3"
-                       VerticalAlignment="Bottom">
-                 <Hyperlink NavigateUri="https://gitee.com/yanjinhua/WPFDevelopers.git" 
-                            RequestNavigate="QQHyperlink_RequestNavigate"> QQ群：340500857 | QQ群：458041663</Hyperlink>
+            <TextBlock
+                Grid.Row="3"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Bottom"
+                FontSize="11">
+                <Hyperlink NavigateUri="https://gitee.com/yanjinhua/WPFDevelopers.git" RequestNavigate="QQHyperlink_RequestNavigate">QQ群：340500857 | QQ群：458041663</Hyperlink>
             </TextBlock>
-            <TextBlock Text="Copyright ©  2022 WPFDevelopers. All rights reserved."
-                       HorizontalAlignment="Center" FontSize="11"
-                       VerticalAlignment="Bottom"
-                       Padding="0,10"
-                       Grid.Row="4"/>
+            <TextBlock
+                Grid.Row="4"
+                Padding="0,10"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Bottom"
+                FontSize="11"
+                Text="Copyright ©  2022 WPFDevelopers. All rights reserved." />
         </Grid>
     </Grid>
-</Window>
+</wd:Window>

src/WPFDevelopers.Samples.Shared/ExampleViews/AboutWindow.xaml.cs

@@ -1,40 +1,18 @@
-#if NET40
-using Microsoft.Windows.Shell;
-#else
-using System.Windows.Shell;
-# endif
-using System;
+using System;
 using System.Diagnostics;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Navigation;
 
 namespace WPFDevelopers.Samples.ExampleViews
 {
     /// <summary>
     ///     Window1.xaml 的交互逻辑
     /// </summary>
-    public partial class AboutWindow : Window
+    public partial class AboutWindow
     {
         public AboutWindow()
         {
             InitializeComponent();
-#if NET40
-            var windowChrome = new WindowChrome
-            {
-                CaptionHeight = 160,
-                GlassFrameThickness = new Thickness(1)
-            };
-            WindowChrome.SetIsHitTestVisibleInChrome(CloseButton, true);
-#else
-            var windowChrome = new WindowChrome
-            {
-                CaptionHeight = 160,
-                GlassFrameThickness = new Thickness(1),
-                UseAeroCaptionButtons = false
-            };
-             WindowChrome.SetIsHitTestVisibleInChrome(CloseButton, true);
-#endif
         }
 
         private void GithubHyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)