Skip to content

Commit 77b29ea

Browse files
yanjinhuagoodyanjinhuagood
authored
Merge pull request #147 from WPFDevelopersOrg/dev
merge dev into master
2 parents a736245 + cdee8e0 commit 77b29ea

File tree

212 files changed

+5110
-3713
lines changed

Some content is hidden

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

212 files changed

+5110
-3713
lines changed

‎src/Resources.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\AMap\Car2.png">
4040
<Link>Resources\Images\AMap\Car2.png</Link>
4141
</Resource>
42-
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\AnimationNavigationBar3D\background.png">
43-
<Link>Resources\Images\AnimationNavigationBar3D\background.png</Link>
42+
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\NavMenu3D\background.png">
43+
<Link>Resources\Images\NavMenu3D\background.png</Link>
4444
</Resource>
4545
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\Breathe\*.jpg">
4646
<Link>Resources\Images\Breathe\%(Filename)%(Extension)</Link>

‎src/TargetFrameworks.props

+9
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,17 @@
1616
<PackageReference Include="System.Drawing.Common">
1717
<Version>7.0.0</Version>
1818
</PackageReference>
19+
<PackageReference Include="Microsoft.Win32.SystemEvents">
20+
<Version>7.0.0</Version>
21+
</PackageReference>
1922
</ItemGroup>
2023
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
2124
<PackageReference Include="System.Drawing.Common">
2225
<Version>7.0.0</Version>
2326
</PackageReference>
27+
<PackageReference Include="Microsoft.Win32.SystemEvents">
28+
<Version>7.0.0</Version>
29+
</PackageReference>
2430
</ItemGroup>
2531
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows'">
2632
<PackageReference Include="System.Drawing.Common">
@@ -36,5 +42,8 @@
3642
<PackageReference Include="System.Drawing.Common">
3743
<Version>7.0.0</Version>
3844
</PackageReference>
45+
<PackageReference Include="Microsoft.Win32.SystemEvents">
46+
<Version>7.0.0</Version>
47+
</PackageReference>
3948
</ItemGroup>
4049
</Project>

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

+15-17
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@
88
xmlns:wd="clr-namespace:WPFDevelopers.Net40">
99
<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
1010
<Style BasedOn="{x:Null}" TargetType="{x:Type wd:Window}">
11-
<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
12-
<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
13-
<Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
14-
<Setter Property="TitleBackground" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
11+
<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextBrush}" />
12+
<Setter Property="Background" Value="{DynamicResource WD.BackgroundBrush}" />
13+
<Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrush}" />
14+
<Setter Property="TitleBackground" Value="{DynamicResource WD.WindowBorderBrush}" />
1515
<Setter Property="IsTabStop" Value="False" />
1616
<Setter Property="BorderThickness" Value="1" />
1717
<Setter Property="SnapsToDevicePixels" Value="True" />
1818
<Setter Property="UseLayoutRounding" Value="True" />
1919
<Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
2020
<Setter Property="WindowStyle" Value="None" />
21-
<Setter Property="MaxHeight" Value="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" />
22-
<Setter Property="FontFamily" Value="{DynamicResource WD.NormalFontFamily}" />
21+
<Setter Property="FontFamily" Value="{DynamicResource WD.FontFamily}" />
2322
<Setter Property="shell:WindowChrome.WindowChrome">
2423
<Setter.Value>
2524
<shell:WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wd:Window}}" GlassFrameThickness="0,0,0,.1" />
@@ -70,7 +69,7 @@
7069
VerticalAlignment="Center"
7170
Content="{TemplateBinding Title}"
7271
FontSize="{DynamicResource {x:Static SystemFonts.CaptionFontSizeKey}}"
73-
Foreground="{DynamicResource WD.WindowForegroundColorBrush}"
72+
Foreground="{DynamicResource WD.WindowTextBrush}"
7473
IsTabStop="False" />
7574
</StackPanel>
7675
<StackPanel
@@ -93,7 +92,7 @@
9392
Height="1"
9493
Margin="0,7,0,0"
9594
VerticalAlignment="Bottom"
96-
Fill="{DynamicResource WD.WindowForegroundColorBrush}" />
95+
Fill="{DynamicResource WD.WindowTextBrush}" />
9796
</Grid>
9897
</Button>
9998
<Button
@@ -110,7 +109,7 @@
110109
HorizontalAlignment="Center"
111110
VerticalAlignment="Center"
112111
Data="{DynamicResource WD.WindowMaximizeGeometry}"
113-
Fill="{DynamicResource WD.WindowForegroundColorBrush}"
112+
Fill="{DynamicResource WD.WindowTextBrush}"
114113
Stretch="Uniform"
115114
UseLayoutRounding="False" />
116115
</Grid>
@@ -130,7 +129,7 @@
130129
HorizontalAlignment="Center"
131130
VerticalAlignment="Center"
132131
Data="{DynamicResource WD.WindowRestoreGeometry}"
133-
Fill="{DynamicResource WD.WindowForegroundColorBrush}"
132+
Fill="{DynamicResource WD.WindowTextBrush}"
134133
Stretch="Uniform"
135134
UseLayoutRounding="False" />
136135
</Grid>
@@ -149,7 +148,7 @@
149148
HorizontalAlignment="Center"
150149
VerticalAlignment="Center"
151150
Data="{DynamicResource WD.WindowCloseGeometry}"
152-
Fill="{DynamicResource WD.WindowForegroundColorBrush}"
151+
Fill="{DynamicResource WD.WindowTextBrush}"
153152
Stretch="Uniform" />
154153
</Button>
155154
</StackPanel>
@@ -183,7 +182,7 @@
183182
Margin="6,0"
184183
VerticalAlignment="Center"
185184
FontSize="{DynamicResource WD.TitleFontSize}"
186-
Foreground="{DynamicResource WD.WindowForegroundColorBrush}"
185+
Foreground="{DynamicResource WD.WindowTextBrush}"
187186
Text="{TemplateBinding Title}" />
188187
<StackPanel
189188
Grid.Column="2"
@@ -205,7 +204,7 @@
205204
Height="1"
206205
Margin="0,7,0,0"
207206
VerticalAlignment="Bottom"
208-
Fill="{DynamicResource WD.WindowForegroundColorBrush}" />
207+
Fill="{DynamicResource WD.WindowTextBrush}" />
209208
</Grid>
210209
</Button>
211210
<Button
@@ -222,7 +221,7 @@
222221
HorizontalAlignment="Center"
223222
VerticalAlignment="Center"
224223
Data="{DynamicResource WD.WindowMaximizeGeometry}"
225-
Fill="{DynamicResource WD.WindowForegroundColorBrush}"
224+
Fill="{DynamicResource WD.WindowTextBrush}"
226225
Stretch="Uniform"
227226
UseLayoutRounding="False" />
228227
</Grid>
@@ -242,7 +241,7 @@
242241
HorizontalAlignment="Center"
243242
VerticalAlignment="Center"
244243
Data="{DynamicResource WD.WindowRestoreGeometry}"
245-
Fill="{DynamicResource WD.WindowForegroundColorBrush}"
244+
Fill="{DynamicResource WD.WindowTextBrush}"
246245
Stretch="Uniform"
247246
UseLayoutRounding="False" />
248247
</Grid>
@@ -261,7 +260,7 @@
261260
HorizontalAlignment="Center"
262261
VerticalAlignment="Center"
263262
Data="{DynamicResource WD.WindowCloseGeometry}"
264-
Fill="{DynamicResource WD.WindowForegroundColorBrush}"
263+
Fill="{DynamicResource WD.WindowTextBrush}"
265264
Stretch="Uniform" />
266265
</Button>
267266
</StackPanel>
@@ -305,7 +304,6 @@
305304
<Setter TargetName="PART_GridChrome" Property="Visibility" Value="Collapsed" />
306305
<Setter TargetName="PART_TitleToolBar" Property="Visibility" Value="Visible" />
307306
</Trigger>
308-
309307
<MultiTrigger>
310308
<MultiTrigger.Conditions>
311309
<Condition Property="ResizeMode" Value="CanResizeWithGrip" />

0 commit comments

Comments
 (0)