Skip to content

Commit e40dbf1

Browse files
yanjinhuagoodyanjinhuagood
authored
Merge pull request #173 from WPFDevelopersOrg/0.0.0.2
0.0.0.2 merge master
2 parents 1216aff + f3102c8 commit e40dbf1

File tree

86 files changed

+2622
-634
lines changed

Some content is hidden

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

86 files changed

+2622
-634
lines changed

‎src/Package.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<IncludeSymbols>true</IncludeSymbols>
88
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
99
<Copyright>Copyright © WPFDevelopersOrg 2025</Copyright>
10-
<AssemblyVersion>1.1.0.3</AssemblyVersion>
11-
<FileVersion>1.1.0.3</FileVersion>
12-
<Version>1.1.0.3</Version>
10+
<AssemblyVersion>0.0.0.2</AssemblyVersion>
11+
<FileVersion>0.0.0.2</FileVersion>
12+
<Version>0.0.0.2</Version>
1313
<RepositoryUrl>https://github.com/WPFDevelopersOrg/WPFDevelopers</RepositoryUrl>
1414
<Configurations>Debug;Release;Debug-.NET40;Release-.NET40</Configurations>
1515
</PropertyGroup>

‎src/Resources.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\ZooSemy\1.png">
7676
<Link>Resources\Images\ZooSemy\1.png</Link>
7777
</Resource>
78+
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Images\IconicThumbnail\*.jpg">
79+
<Link>Resources\Images\IconicThumbnail\%(Filename)%(Extension)</Link>
80+
</Resource>
7881
<Resource Include="..\WPFDevelopers.Samples.Shared\Resources\Audio\HelloWPFDevelopes_en.mp3">
7982
<Link>Resources\Audio\HelloWPFDevelopes_en.mp3</Link>
8083
</Resource>

‎src/TargetFrameworks.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<Version>7.0.0</Version>
1818
</PackageReference>
1919
<PackageReference Include="Microsoft.Win32.SystemEvents">
20-
<Version>7.0.0</Version>
20+
<Version>5.0.0</Version>
2121
</PackageReference>
2222
</ItemGroup>
2323
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
@@ -43,7 +43,7 @@
4343
<Version>7.0.0</Version>
4444
</PackageReference>
4545
<PackageReference Include="Microsoft.Win32.SystemEvents">
46-
<Version>7.0.0</Version>
46+
<Version>4.7.0</Version>
4747
</PackageReference>
4848
</ItemGroup>
4949
</Project>

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<Setter Property="SnapsToDevicePixels" Value="True" />
1818
<Setter Property="UseLayoutRounding" Value="True" />
1919
<Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
20-
<Setter Property="WindowStyle" Value="None" />
2120
<Setter Property="FontFamily" Value="{DynamicResource WD.FontFamily}" />
2221
<Setter Property="shell:WindowChrome.WindowChrome">
2322
<Setter.Value>
@@ -27,11 +26,6 @@
2726
<Setter Property="Template">
2827
<Setter.Value>
2928
<ControlTemplate TargetType="{x:Type wd:Window}">
30-
<ControlTemplate.Resources>
31-
<Style TargetType="Grid">
32-
<Setter Property="Background" Value="Transparent" />
33-
</Style>
34-
</ControlTemplate.Resources>
3529
<Border
3630
Name="PART_Border"
3731
Background="{TemplateBinding Background}"
@@ -43,10 +37,12 @@
4337
<RowDefinition Height="Auto" />
4438
<RowDefinition Height="*" />
4539
</Grid.RowDefinitions>
46-
<control:SmallPanel
47-
x:Name="PART_Normal"
40+
<Border
4841
Grid.Row="0"
49-
Background="{TemplateBinding TitleBackground}">
42+
Margin="0,0,-1,0"
43+
HorizontalAlignment="Stretch"
44+
Background="{TemplateBinding TitleBackground}" />
45+
<control:SmallPanel x:Name="PART_Normal" Grid.Row="0">
5046
<Grid Height="{TemplateBinding TitleHeight}">
5147
<Grid.ColumnDefinitions>
5248
<ColumnDefinition Width="*" />
@@ -85,7 +81,7 @@
8581
Orientation="Horizontal">
8682
<StackPanel x:Name="PART_TitleBarMinAndMax" Orientation="Horizontal">
8783
<Button
88-
Name="PART_TitleBarMinimizeButton"
84+
x:Name="PART_TitleBarMinimizeButton"
8985
Padding="0"
9086
Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}"
9187
IsTabStop="False"
@@ -101,7 +97,7 @@
10197
</Grid>
10298
</Button>
10399
<Button
104-
Name="PART_TitleBarMaximizeButton"
100+
x:Name="PART_TitleBarMaximizeButton"
105101
Padding="0"
106102
Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}"
107103
IsTabStop="False"
@@ -120,7 +116,7 @@
120116
</Grid>
121117
</Button>
122118
<Button
123-
Name="PART_TitleBarRestoreButton"
119+
x:Name="PART_TitleBarRestoreButton"
124120
Padding="0"
125121
Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}"
126122
IsTabStop="False"
@@ -162,7 +158,6 @@
162158
<control:SmallPanel
163159
x:Name="PART_HighTitleBar"
164160
Grid.Row="0"
165-
Background="{TemplateBinding TitleBackground}"
166161
Visibility="Collapsed">
167162
<Grid
168163
x:Name="PART_GridChrome"
@@ -213,7 +208,7 @@
213208
</Grid>
214209
</Button>
215210
<Button
216-
Name="PART_MaximizeButton"
211+
x:Name="PART_MaximizeButton"
217212
Padding="0"
218213
Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}"
219214
IsTabStop="False"
@@ -232,7 +227,7 @@
232227
</Grid>
233228
</Button>
234229
<Button
235-
Name="PART_RestoreButton"
230+
x:Name="PART_RestoreButton"
236231
Padding="0"
237232
Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}"
238233
IsTabStop="False"

0 commit comments

Comments
 (0)