Skip to content

Commit 363dea5

Browse files
yanjinhuagoodyanjinhuagood
authored
Merge pull request #237 from WPFDevelopersOrg/0.0.0.3
Merge: 0.0.0.3 branch to master
2 parents d1c26c1 + 741dca0 commit 363dea5

93 files changed

Lines changed: 4060 additions & 1658 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/Themes/Theme.xaml‎

Lines changed: 217 additions & 126 deletions
Large diffs are not rendered by default.

‎src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<Import Project="../Package.props" />
33
<PropertyGroup>
4+
<RestoreProjectStyle>None</RestoreProjectStyle>
45
<TargetFramework>net40</TargetFramework>
56
<SignAssembly>True</SignAssembly>
67
</PropertyGroup>

‎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‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,6 @@
9191
<SolidColorBrush Color="{Binding SelectedColor, ElementName=PART_ColorPicker}" />
9292
</wd:PathIcon.Foreground>
9393
</wd:PathIcon>
94-
<!--<Button
95-
x:Name="PART_CopyButton"
96-
Margin="8,2.5"
97-
HorizontalAlignment="Right"
98-
VerticalAlignment="Top"
99-
ToolTip="Copy"
100-
Visibility="Collapsed">
101-
<wd:PathIcon Kind="Copy" />
102-
</Button>-->
10394
<TextBlock
10495
Margin="2,0,6,6"
10596
HorizontalAlignment="Center"
@@ -108,11 +99,6 @@
10899
TextTrimming="CharacterEllipsis"
109100
ToolTip="{Binding .}" />
110101
</wd:SmallPanel>
111-
<!--<DataTemplate.Triggers>
112-
<DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}" Value="True">
113-
<Setter TargetName="PART_CopyButton" Property="Visibility" Value="Visible" />
114-
</DataTrigger>
115-
</DataTemplate.Triggers>-->
116102
</DataTemplate>
117103
</ListBox.ItemTemplate>
118104
<ListBox.ItemsPanel>

‎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
}

0 commit comments

Comments
 (0)