Skip to content

Commit 4d13c0c

Browse files
yanjinhuagoodyanjinhuagood
authored
Merge pull request #36 from WPFDevelopersOrg/dev
Dev
2 parents f408577 + 44aa624 commit 4d13c0c

File tree

105 files changed

+1900
-2791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1900
-2791
lines changed

‎src/WPFDevelopers.Net40/Themes/Theme.xaml‎

Lines changed: 27 additions & 700 deletions
Large diffs are not rendered by default.

‎src/WPFDevelopers.Net40/Window.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Windows.Input;
66
using System.Windows.Interop;
77
using Microsoft.Windows.Shell;
8+
using WPFDevelopers.Helpers;
89

910
namespace WPFDevelopers.Net40
1011
{
@@ -104,7 +105,7 @@ internal class ApiCodes
104105

105106
private IntPtr hWnd;
106107

107-
[DllImport("user32.dll")]
108+
[DllImport(Win32.User32)]
108109
public static extern int SendMessage(IntPtr hWnd, int wMsg, IntPtr wParam, IntPtr lParam);
109110

110111
private IntPtr WindowProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)

‎src/WPFDevelopers.Net45x/Themes/Theme.xaml‎

Lines changed: 27 additions & 700 deletions
Large diffs are not rendered by default.

‎src/WPFDevelopers.Net45x/Window.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Windows;
44
using System.Windows.Input;
55
using System.Windows.Interop;
6+
using WPFDevelopers.Helpers;
67

78
namespace WPFDevelopers.Net45x
89
{
@@ -104,7 +105,7 @@ internal class ApiCodes
104105

105106
private IntPtr hWnd;
106107

107-
[DllImport("user32.dll")]
108+
[DllImport(Win32.User32)]
108109
public static extern int SendMessage(IntPtr hWnd, int wMsg, IntPtr wParam, IntPtr lParam);
109110

110111
private IntPtr WindowProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)

‎src/WPFDevelopers.Samples.Shared/App.xaml‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,35 @@
1-
<Application x:Class="WPFDevelopers.Samples.App"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:ws="https://github.com/WPFDevelopersOrg/WPFDevelopers"
5-
xmlns:avalonedit="http://icsharpcode.net/sharpdevelop/avalonedit"
6-
StartupUri="ExampleViews\MainWindow.xaml" ShutdownMode="OnMainWindowClose">
1+
<Application
2+
x:Class="WPFDevelopers.Samples.App"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:avalonedit="http://icsharpcode.net/sharpdevelop/avalonedit"
6+
xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
7+
ShutdownMode="OnMainWindowClose"
8+
StartupUri="ExampleViews\MainWindow.xaml">
79
<Application.Resources>
810
<ResourceDictionary>
911
<ResourceDictionary.MergedDictionaries>
10-
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Light.Blue.xaml"/>
11-
<!--需要注意ws:Resources 必须再配色主题后，Theme="Dark" 为黑色皮肤-->
12-
<ws:Resources Theme="Light"/>
13-
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Theme.xaml"/>
14-
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/ExampleViews/LoginWindow/Generic.xaml"/>
15-
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/CodeViewer/CodeViewer.xaml"/>
12+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Light.Blue.xaml" />
13+
<!-- 需要注意ws:Resources 必须再配色主题后，Theme="Dark" 为黑色皮肤 -->
14+
<wd:Resources Theme="Light" />
15+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Theme.xaml" />
16+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/ExampleViews/LoginWindow/Generic.xaml" />
17+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/CodeViewer/CodeViewer.xaml" />
18+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/TimeLine/TimeLine.xaml" />
19+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/Drawing/Drawing.xaml" />
20+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/Others/OtherControl.xaml" />
21+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/ChatEmoji/ChatEmoji.xaml" />
22+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/RoundPicker/RoundPicker.xaml" />
23+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/CutImage/CutImage.xaml" />
24+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/Dashboard/Dashboard.xaml" />
25+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/PieControl/PieControl.xaml" />
26+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/Prize/PrizeItemControl.xaml" />
27+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/RainbowButtons/RainbowButtons.xaml" />
28+
<ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/SnowCanvas/SnowCanvas.xaml" />
1629
</ResourceDictionary.MergedDictionaries>
1730
<Style TargetType="avalonedit:TextEditor">
18-
<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}"/>
19-
<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}"/>
31+
<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
32+
<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
2033
</Style>
2134
</ResourceDictionary>
2235
</Application.Resources>

‎src/WPFDevelopers.Shared/Controls/ChatEmoji/ChatEmoji.cs‎ renamed to ‎src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Windows.Media;
44
using WPFDevelopers.Helpers;
55

6-
namespace WPFDevelopers.Controls
6+
namespace WPFDevelopers.Samples.Controls
77
{
88
[TemplatePart(Name = TextBlockTemplateName, Type = typeof(TextBlock))]
99
[TemplatePart(Name = WrapPanelLeftTemplateName, Type = typeof(WrapPanel))]

‎src/WPFDevelopers.Shared/Themes/ChatEmoji.xaml‎ renamed to ‎src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/ChatEmoji.xaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<ResourceDictionary
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:controls="clr-namespace:WPFDevelopers.Controls">
5-
<ResourceDictionary.MergedDictionaries>
6-
<ResourceDictionary Source="Basic/ControlBasic.xaml" />
7-
</ResourceDictionary.MergedDictionaries>
4+
xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
5+
xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers">
86
<Style
97
x:Key="WD.ChatEmoji"
108
BasedOn="{StaticResource WD.ControlBasicStyle}"

‎src/WPFDevelopers.Shared/Controls/ChatEmoji/EmojiHelper.cs‎ renamed to ‎src/WPFDevelopers.Samples.Shared/Controls/ChatEmoji/EmojiHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Windows.Media;
88
using System.Windows.Media.Imaging;
99

10-
namespace WPFDevelopers.Controls
10+
namespace WPFDevelopers.Samples.Controls
1111
{
1212
public class EmojiHelper
1313
{

‎src/WPFDevelopers.Shared/Controls/CountdownTimer/CountdownTimer.cs‎ renamed to ‎src/WPFDevelopers.Samples.Shared/Controls/CountdownTimer/CountdownTimer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Windows.Media.Animation;
88
using System.Windows.Media.Effects;
99

10-
namespace WPFDevelopers.Controls
10+
namespace WPFDevelopers.Samples.Controls
1111
{
1212
public enum CountdownTimerEffect
1313
{

‎src/WPFDevelopers.Shared/Controls/CutImage/CutImage.cs‎ renamed to ‎src/WPFDevelopers.Samples.Shared/Controls/CutImage/CutImage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Windows.Media.Imaging;
55
using System.Windows.Shapes;
66

7-
namespace WPFDevelopers.Controls
7+
namespace WPFDevelopers.Samples.Controls
88
{
99
[TemplatePart(Name = DragDropTemplateName, Type = typeof(DragDrop))]
1010
[TemplatePart(Name = RectangleTemplateName, Type = typeof(Rectangle))]

0 commit comments

Comments
 (0)