Merge pull request #62 from WPFDevelopersOrg/dev

master pull request  dev

Author: yanjinhuagood

src/WPFDevelopers.Net40/Themes/Generic.xaml

@@ -27,6 +27,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type wd:Window}">
                     <Border
+                        Name="PART_Border"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
@@ -161,7 +162,7 @@
                         <Trigger Property="WindowState" Value="Maximized">
                             <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
                             <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="LayoutRoot" Property="Margin" Value="7" />
+                            <Setter TargetName="PART_Border" Property="Margin" Value="7" />
                         </Trigger>
                         <Trigger Property="WindowStyle" Value="ToolWindow">
                             <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />

src/WPFDevelopers.Net40/Themes/Theme.xaml

@@ -33,6 +33,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type wd:Window}">
                     <Border
+                        Name="PART_Border"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
@@ -167,7 +168,7 @@
                         <Trigger Property="WindowState" Value="Maximized">
                             <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
                             <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="LayoutRoot" Property="Margin" Value="7" />
+                            <Setter TargetName="PART_Border" Property="Margin" Value="7" />
                         </Trigger>
                         <Trigger Property="WindowStyle" Value="ToolWindow">
                             <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />

src/WPFDevelopers.Net45x/Themes/Generic.xaml

@@ -13,6 +13,7 @@
                 <!--  需要注意ws:Resources 必须再配色主题后，Theme="Dark" 为黑色皮肤  -->
                 <wd:Resources Theme="Light" />
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Theme.xaml" />
+                <!--  下方不用拷贝  -->
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/ExampleViews/LoginWindow/Generic.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/CodeViewer/CodeViewer.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/TimeLine/TimeLine.xaml" />

src/WPFDevelopers.Net45x/Themes/Theme.xaml

@@ -0,0 +1,20 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.ColorPickerExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <controls:CodeViewer>
+        <wd:ColorPicker />
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ColorPickerExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ColorPickerExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>

src/WPFDevelopers.Samples.Shared/App.xaml

@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// BarrageExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class ColorPickerExample : UserControl
+    {
+        public ColorPickerExample()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -17,10 +17,12 @@
             Rows="1">
             <wd:NumericBox
                 Width="100"
+                Height="30"
                 Maximum="100"
                 Minimum="0" />
             <wd:NumericBox
                 Width="100"
+                Height="40"
                 Margin="10,0"
                 Maximum="1000"
                 Minimum="100"

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

@@ -76,6 +76,7 @@ public enum MenuEnum
         Message,
         PathIcon,
         NumericBox,
+        ColorPicker,
         VirtualizingWrapPanel,
         AcrylicBlur,
         TaskbarInfo

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

@@ -306,6 +306,9 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.NumericBox:
                     ControlPanel = new NumericBoxExample();
                     break;
+                case MenuEnum.ColorPicker:
+                    ControlPanel = new ColorPickerExample();
+                    break;
                 case MenuEnum.VirtualizingWrapPanel:
                     ControlPanel = new VirtualizingWrapPanel();
                     new VirtualizingWrapPanelExample().MaskShowDialog();