Dev

src/WPFDevelopers.Net40/Window.cs

@@ -5,6 +5,7 @@
 using System.Windows.Input;
 using System.Windows.Interop;
 using Microsoft.Windows.Shell;
+using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Net40
 {
@@ -104,7 +105,7 @@ internal class ApiCodes
 
         private IntPtr hWnd;
 
-        [DllImport("user32.dll")]
+        [DllImport(Win32.User32)]
         public static extern int SendMessage(IntPtr hWnd, int wMsg, IntPtr wParam, IntPtr lParam);
 
         private IntPtr WindowProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)

src/WPFDevelopers.Net45x/Window.cs

@@ -3,6 +3,7 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
+using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Net45x
 {
@@ -104,7 +105,7 @@ internal class ApiCodes
 
         private IntPtr hWnd;
 
-        [DllImport("user32.dll")]
+        [DllImport(Win32.User32)]
         public static extern int SendMessage(IntPtr hWnd, int wMsg, IntPtr wParam, IntPtr lParam);
 
         private IntPtr WindowProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)

src/WPFDevelopers.Samples.Shared/App.xaml

@@ -1,22 +1,35 @@
-<Application x:Class="WPFDevelopers.Samples.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:ws="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:avalonedit="http://icsharpcode.net/sharpdevelop/avalonedit"
-             StartupUri="ExampleViews\MainWindow.xaml" ShutdownMode="OnMainWindowClose">
+<Application
+    x:Class="WPFDevelopers.Samples.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:avalonedit="http://icsharpcode.net/sharpdevelop/avalonedit"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    ShutdownMode="OnMainWindowClose"
+    StartupUri="ExampleViews\MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Light.Blue.xaml"/>
-                <!--需要注意ws:Resources 必须再配色主题后，Theme="Dark" 为黑色皮肤-->
-                <ws: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;component/Themes/Light.Blue.xaml" />
+                <!--  需要注意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" />
+                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/Drawing/Drawing.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/Others/OtherControl.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/ChatEmoji/ChatEmoji.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/RoundPicker/RoundPicker.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/CutImage/CutImage.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/Dashboard/Dashboard.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/PieControl/PieControl.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/Prize/PrizeItemControl.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/RainbowButtons/RainbowButtons.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/SnowCanvas/SnowCanvas.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="avalonedit:TextEditor">
-                <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}"/>
-                <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}"/>
+                <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
             </Style>
         </ResourceDictionary>
     </Application.Resources>

src/WPFDevelopers.Shared/Controls/ChatEmoji/ChatEmoji.cs → src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.cs

@@ -3,7 +3,7 @@
 using System.Windows.Media;
 using WPFDevelopers.Helpers;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     [TemplatePart(Name = TextBlockTemplateName, Type = typeof(TextBlock))]
     [TemplatePart(Name = WrapPanelLeftTemplateName, Type = typeof(WrapPanel))]

src/WPFDevelopers.Shared/Themes/ChatEmoji.xaml → src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.xaml

@@ -1,10 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Controls">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
-    </ResourceDictionary.MergedDictionaries>
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers">
     <Style
         x:Key="WD.ChatEmoji"
         BasedOn="{StaticResource WD.ControlBasicStyle}"

src/WPFDevelopers.Shared/Controls/ChatEmoji/EmojiHelper.cs → src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/EmojiHelper.cs

@@ -7,7 +7,7 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     public class EmojiHelper
     {

src/WPFDevelopers.Shared/Controls/CountdownTimer/CountdownTimer.cs → src/WPFDevelopers.Samples.Shared/Controls/CountdownTimer/CountdownTimer.cs

@@ -7,7 +7,7 @@
 using System.Windows.Media.Animation;
 using System.Windows.Media.Effects;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     public enum CountdownTimerEffect
     {

src/WPFDevelopers.Shared/Controls/CutImage/CutImage.cs → src/WPFDevelopers.Samples.Shared/Controls/CutImage/CutImage.cs

@@ -4,7 +4,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     [TemplatePart(Name = DragDropTemplateName, Type = typeof(DragDrop))]
     [TemplatePart(Name = RectangleTemplateName, Type = typeof(Rectangle))]

src/WPFDevelopers.Shared/Themes/CutImage.xaml → src/WPFDevelopers.Samples.Shared/Controls/CutImage/CutImage.xaml

@@ -1,11 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Controls">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
-        <ResourceDictionary Source="Basic/Animations.xaml" />
-    </ResourceDictionary.MergedDictionaries>
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers">
     <Style
         x:Key="WD.BottomThumbStyle"
         BasedOn="{StaticResource WD.ControlBasicStyle}"
@@ -58,7 +55,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:CutImage}">
-                    <controls:SmallPanel>
+                    <wd:SmallPanel>
                         <Border x:Name="PART_BorderPanel">
                             <Canvas
                                 x:Name="DrawCanvas"
@@ -106,7 +103,7 @@
                                     Visibility="Collapsed" />
                             </Canvas>
                         </Border>
-                    </controls:SmallPanel>
+                    </wd:SmallPanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>

src/WPFDevelopers.Shared/Controls/CutImage/DragDrop.cs → src/WPFDevelopers.Samples.Shared/Controls/CutImage/DragDrop.cs

@@ -3,7 +3,7 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     [TemplatePart(Name = ThumbTemplateName, Type = typeof(Thumb))]
     [TemplatePart(Name = ThumbRightBottomTemplateName, Type = typeof(Thumb))]

src/WPFDevelopers.Shared/Controls/Dashboard/Dashboard.cs → src/WPFDevelopers.Samples.Shared/Controls/Dashboard/Dashboard.cs

@@ -5,7 +5,7 @@
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     public class Dashboard : ProgressBar
     {

src/WPFDevelopers.Shared/Themes/Dashboard.xaml → src/WPFDevelopers.Samples.Shared/Controls/Dashboard/Dashboard.xaml

@@ -1,12 +1,11 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:ec="clr-namespace:Microsoft.Expression.Controls"
-    xmlns:ed="clr-namespace:Microsoft.Expression.Drawing.Shapes">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
-    </ResourceDictionary.MergedDictionaries>
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:ec="http://www.microsoft.net/controls"
+    xmlns:ed="http://www.microsoft.net/drawing"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers">
+
     <LinearGradientBrush x:Key="WD.DashboardNormalBrush" StartPoint="0.5,0" EndPoint="0.5,1">
         <GradientStop Color="#FF164DA7" />
         <GradientStop Offset="1" Color="#FF19DCF0" />
@@ -23,16 +22,16 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:Dashboard}">
                     <Viewbox>
-                        <controls:SmallPanel
+                        <wd:SmallPanel
                             Width="{TemplateBinding Width}"
                             Height="{TemplateBinding Height}"
                             Background="{TemplateBinding Background}"
                             RenderTransformOrigin="0.5,0.5">
-                            <controls:SmallPanel.RenderTransform>
+                            <wd:SmallPanel.RenderTransform>
                                 <TransformGroup>
                                     <RotateTransform Angle="-90" />
                                 </TransformGroup>
-                            </controls:SmallPanel.RenderTransform>
+                            </wd:SmallPanel.RenderTransform>
                             <ed:Arc
                                 Margin="10"
                                 ArcThickness="8"
@@ -91,7 +90,7 @@
                                     Foreground="{StaticResource WD.DashboardNormalBrush}"
                                     Text="{Binding Path=Value, StringFormat={}{0}%, RelativeSource={RelativeSource TemplatedParent}}" />
                             </Border>
-                        </controls:SmallPanel>
+                        </wd:SmallPanel>
                     </Viewbox>
                 </ControlTemplate>
             </Setter.Value>

src/WPFDevelopers.Shared/Controls/Dashboard/ScaleItem.cs → src/WPFDevelopers.Samples.Shared/Controls/Dashboard/ScaleItem.cs

@@ -1,7 +1,7 @@
 using System.Windows.Media;
 using WPFDevelopers.Helpers;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     public class ScaleItem : ViewModelBase
     {

src/WPFDevelopers.Shared/Themes/Drawing.xaml → src/WPFDevelopers.Samples.Shared/Controls/Drawing/Drawing.xaml

@@ -1,10 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Controls">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
-    </ResourceDictionary.MergedDictionaries>
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers">
     <Style
         x:Key="WD.DrawingControlItem"
         BasedOn="{StaticResource WD.ControlBasicStyle}"
@@ -71,7 +69,7 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         SnapsToDevicePixels="true">
-                        <controls:SmallPanel>
+                        <wd:SmallPanel>
                             <ScrollViewer Padding="{TemplateBinding Padding}" Focusable="false">
                                 <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </ScrollViewer>
@@ -86,7 +84,7 @@
                                 CornerRadius="{TemplateBinding InnerCornerRadius}">
                                 <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
                             </Border>
-                        </controls:SmallPanel>
+                        </wd:SmallPanel>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">

src/WPFDevelopers.Shared/Controls/Drawing/DrawingControl.cs → src/WPFDevelopers.Samples.Shared/Controls/Drawing/DrawingControl.cs

@@ -3,11 +3,9 @@
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     [TemplatePart(Name = _PartInnerName, Type = typeof(Border))]
-    //[TemplatePart(Name = _PartDrawingPanelName, Type=typeof(DrawingPanel))]
-    //[StyleTypedProperty(Property = "ItemContainerStyle", StyleTargetType = typeof(DrawingElement))]
     public class DrawingControl : ListBox
     {
         private const string _PartInnerName = "PART_InnerBorder";

src/WPFDevelopers.Shared/Controls/Drawing/DrawingPanel.cs → src/WPFDevelopers.Samples.Shared/Controls/Drawing/DrawingPanel.cs

@@ -6,7 +6,7 @@
 using WPFDevelopers.Assists;
 using WPFDevelopers.Utilities;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     public enum DrawingMode
     {

src/WPFDevelopers.Shared/Controls/Others/FireControl.cs → src/WPFDevelopers.Samples.Shared/Controls/Others/FireControl.cs

@@ -1,11 +1,10 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     public class FireControl : Control
     {
-        // Using a DependencyProperty as the backing store for IsStart.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty IsStartProperty =
             DependencyProperty.Register("IsStart", typeof(bool), typeof(FireControl),
                 new PropertyMetadata(default(bool)));

src/WPFDevelopers.Shared/Themes/OtherControl.xaml → src/WPFDevelopers.Samples.Shared/Controls/Others/OtherControl.xaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Controls">
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers">
     <Style
         x:Key="WD.FireControl"
         BasedOn="{StaticResource WD.ControlBasicStyle}"
@@ -34,18 +35,18 @@
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <Viewbox>
-                        <controls:SmallPanel
+                        <wd:SmallPanel
                             x:Name="PART_Container"
                             Width="50"
                             Height="50"
                             RenderTransformOrigin="0,1">
-                            <controls:SmallPanel.RenderTransform>
+                            <wd:SmallPanel.RenderTransform>
                                 <TransformGroup>
                                     <RotateTransform CenterX="25" CenterY="25" />
                                     <ScaleTransform />
                                 </TransformGroup>
-                            </controls:SmallPanel.RenderTransform>
-                            <controls:SmallPanel VerticalAlignment="Bottom">
+                            </wd:SmallPanel.RenderTransform>
+                            <wd:SmallPanel VerticalAlignment="Bottom">
                                 <Path
                                     Height="50"
                                     HorizontalAlignment="Center"
@@ -105,8 +106,8 @@
                                             Color="LightYellow" />
                                     </Path.Effect>
                                 </Path>
-                            </controls:SmallPanel>
-                        </controls:SmallPanel>
+                            </wd:SmallPanel>
+                        </wd:SmallPanel>
                     </Viewbox>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsStart" Value="True">

src/WPFDevelopers.Shared/Controls/PieControl/PieControl.cs → src/WPFDevelopers.Samples.Shared/Controls/PieControl/PieControl.cs

@@ -3,7 +3,7 @@
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     public class PieControl : Control
     {

src/WPFDevelopers.Shared/Themes/PieControl.xaml → src/WPFDevelopers.Samples.Shared/Controls/PieControl/PieControl.xaml

@@ -1,11 +1,10 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:ed="clr-namespace:Microsoft.Expression.Drawing.Shapes">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
-    </ResourceDictionary.MergedDictionaries>
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:ed="http://www.microsoft.net/drawing"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers">
+
     <Style
         x:Key="WD.PieControl"
         BasedOn="{StaticResource WD.ControlBasicStyle}"

src/WPFDevelopers.Shared/Controls/PieControl/PieSegmentModel.cs → src/WPFDevelopers.Samples.Shared/Controls/PieControl/PieSegmentModel.cs

@@ -1,7 +1,7 @@
 using System.Windows.Media;
 using WPFDevelopers.Helpers;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     public class PieSegmentModel : ViewModelBase
     {

src/WPFDevelopers.Shared/Controls/Prize/DrawPrize.cs → src/WPFDevelopers.Samples.Shared/Controls/Prize/DrawPrize.cs

@@ -6,7 +6,7 @@
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     [TemplatePart(Name = BorderTemplateName, Type = typeof(Border))]
     [TemplatePart(Name = RotateTransformTemplateName, Type = typeof(RotateTransform))]