Skip to content

Commit 0b34f2e

Browse files
yanjinhuagoodyanjinhuagood
authored
Merge pull request #233 from WPFDevelopersOrg/dev
Merge: dev branch to 0.0.0.3
2 parents 6ce2920 + ed13e5f commit 0b34f2e

68 files changed

Lines changed: 2680 additions & 958 deletions

File tree

Some content is hidden

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

‎src/Package.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PackageId>WPFDevelopers</PackageId>
77
<IncludeSymbols>true</IncludeSymbols>
88
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
9-
<Copyright>Copyright © WPFDevelopersOrg 2025</Copyright>
9+
<Copyright>Copyright © WPFDevelopersOrg 2026</Copyright>
1010
<AssemblyVersion>0.0.0.3</AssemblyVersion>
1111
<FileVersion>0.0.0.3</FileVersion>
1212
<Version>0.0.0.3</Version>

‎src/TargetFrameworks.props‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFrameworks>net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
3+
<TargetFrameworks>net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;net481;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows;net10.0-windows;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
66
<PackageReference Include="System.Drawing.Common">
@@ -58,6 +58,11 @@
5858
<Version>7.0.0</Version>
5959
</PackageReference>
6060
</ItemGroup>
61+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0-windows'">
62+
<PackageReference Include="System.Drawing.Common">
63+
<Version>7.0.0</Version>
64+
</PackageReference>
65+
</ItemGroup>
6166
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
6267
<PackageReference Include="System.Drawing.Common">
6368
<Version>7.0.0</Version>

‎src/WPFDevelopers.Net40/Window.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,15 @@ public Window()
6969
GlassFrameThickness = new Thickness(0, 0, 0, 0.1),
7070
};
7171
WindowChrome.SetWindowChrome(this, _windowChrome);
72+
StateChanged += OnWindow_StateChanged;
73+
}
74+
75+
private void OnWindow_StateChanged(object sender, EventArgs e)
76+
{
77+
if (WindowState == WindowState.Maximized)
78+
_windowChrome.GlassFrameThickness = new Thickness(0);
79+
else
80+
_windowChrome.GlassFrameThickness = new Thickness(0, 0, 0, 0.1);
7281
}
7382

7483
private void Resources_ThemeChanged(ThemeType currentTheme)

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

Lines changed: 1046 additions & 644 deletions
Large diffs are not rendered by default.

‎src/WPFDevelopers.Net45x/Window.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,15 @@ public Window()
6868
UseAeroCaptionButtons = false
6969
};
7070
System.Windows.Shell.WindowChrome.SetWindowChrome(this, _windowChrome);
71+
StateChanged += OnWindow_StateChanged;
72+
}
73+
74+
private void OnWindow_StateChanged(object sender, EventArgs e)
75+
{
76+
if (WindowState == WindowState.Maximized)
77+
_windowChrome.GlassFrameThickness = new Thickness(0);
78+
else
79+
_windowChrome.GlassFrameThickness = new Thickness(0, 0, 0, 0.1);
7180
}
7281

7382
private void Resources_ThemeChanged(ThemeType currentTheme)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Windows;
2-
using WPFDevelopers.Helpers;
32

43
namespace WPFDevelopers.Samples
54
{

‎src/WPFDevelopers.Samples.Shared/ExampleViews/AllPathIconExample.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private void BtnCopyGeometry_Click(object sender, RoutedEventArgs e)
8989
void SetClipboard(string text)
9090
{
9191
Clipboard.SetText(text);
92-
Message.Push("已复制剪切板");
92+
Toast.Push("已复制剪切板");
9393
}
9494
}
9595
}

‎src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ private void ComboBoxLanguages_SelectionChanged(object sender, SelectionChangedE
247247
}
248248
private void BtnGetDateTime_Click(object sender, RoutedEventArgs e)
249249
{
250-
Message.Push(CurrentDateTime.ToString("yyyy-MM-dd HH:mm:ss"));
250+
Toast.Push(CurrentDateTime.ToString("yyyy-MM-dd HH:mm:ss"));
251251
}
252252
}
253253
}

‎src/WPFDevelopers.Samples.Shared/ExampleViews/CropImageExample.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private void BtnSave_Click(object sender, RoutedEventArgs e)
6666
{
6767
if (MyCropImage.CurrentAreaBitmap == null)
6868
{
69-
Message.Push("请选择图片",MessageBoxImage.Warning);
69+
Toast.Push("请选择图片", ToastImage.Warning);
7070
return;
7171
}
7272
var dlg = new SaveFileDialog();

‎src/WPFDevelopers.Samples.Shared/ExampleViews/DataGridFilterExample.xaml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<UserControl
2+
x:Class="WPFDevelopers.Samples.ExampleViews.DataGridFilterExample"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
6+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7+
xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
8+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
10+
d:DesignHeight="450"
11+
d:DesignWidth="800"
12+
mc:Ignorable="d">
13+
<controls:CodeViewer Header="{Binding NavigateMenuItem.Name}">
14+
<TabControl Grid.Row="1" Grid.ColumnSpan="2">
15+
<TabItem Header="Binding Source">
16+
<DataGrid
17+
wd:DataGridHelper.FilterEngine="{Binding Engines}"
18+
wd:ElementHelper.CornerRadius="3"
19+
ItemsSource="{Binding Engines.TypedView}">
20+
<DataGrid.Columns>
21+
<DataGridTextColumn Binding="{Binding Name}" Header="Name" />
22+
<DataGridTextColumn Binding="{Binding Age}" Header="Age" />
23+
<DataGridTextColumn Binding="{Binding City}" Header="City" />
24+
</DataGrid.Columns>
25+
</DataGrid>
26+
</TabItem>
27+
<TabItem Header="Code CSharp">
28+
<DataGrid x:Name="myDataGridCodeCSharp">
29+
<DataGrid.Columns>
30+
<DataGridTextColumn Binding="{Binding Name}" Header="Name" />
31+
<DataGridTextColumn Binding="{Binding Age}" Header="Age" />
32+
<DataGridTextColumn Binding="{Binding City}" Header="City" />
33+
</DataGrid.Columns>
34+
</DataGrid>
35+
</TabItem>
36+
<TabItem Header="Default">
37+
<DataGrid x:Name="myDataGridDefault">
38+
<DataGrid.Columns>
39+
<DataGridTextColumn Binding="{Binding Name}" Header="Name" />
40+
<DataGridTextColumn Binding="{Binding Age}" Header="Age" />
41+
<DataGridTextColumn Binding="{Binding City}" Header="City" />
42+
</DataGrid.Columns>
43+
</DataGrid>
44+
</TabItem>
45+
</TabControl>
46+
<controls:CodeViewer.SourceCodes>
47+
<controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/DataGridFilterExample.xaml" CodeType="Xaml" />
48+
<controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/DataGridFilterExample.xaml.cs" CodeType="CSharp" />
49+
</controls:CodeViewer.SourceCodes>
50+
</controls:CodeViewer>
51+
</UserControl>

0 commit comments

Comments
 (0)