diff --git a/5-17.1理解逻辑树和可视化树/5-17.1理解逻辑树和可视化树.csproj b/5-17.1理解逻辑树和可视化树/5-17.1理解逻辑树和可视化树.csproj
new file mode 100644
index 0000000..404e357
--- /dev/null
+++ b/5-17.1理解逻辑树和可视化树/5-17.1理解逻辑树和可视化树.csproj
@@ -0,0 +1,25 @@
+
+
+
+ WinExe
+ net8.0-windows
+ _5_17._1理解逻辑树和可视化树
+ enable
+ enable
+ true
+
+
+
+
+ MSBuild:Compile
+ Wpf
+ Designer
+
+
+ MSBuild:Compile
+ Wpf
+ Designer
+
+
+
+
diff --git a/5-WPF模板和自定义元素/App.xaml b/5-17.1理解逻辑树和可视化树/App.xaml
similarity index 64%
rename from 5-WPF模板和自定义元素/App.xaml
rename to 5-17.1理解逻辑树和可视化树/App.xaml
index 5475b13..7272a8c 100644
--- a/5-WPF模板和自定义元素/App.xaml
+++ b/5-17.1理解逻辑树和可视化树/App.xaml
@@ -1,7 +1,7 @@
-
diff --git a/5-17.1理解逻辑树和可视化树/App.xaml.cs b/5-17.1理解逻辑树和可视化树/App.xaml.cs
new file mode 100644
index 0000000..dec854f
--- /dev/null
+++ b/5-17.1理解逻辑树和可视化树/App.xaml.cs
@@ -0,0 +1,12 @@
+using System.Configuration;
+using System.Data;
+using System.Windows;
+
+namespace _5_17._1理解逻辑树和可视化树;
+
+///
+/// Interaction logic for App.xaml
+///
+public partial class App : Application
+{
+}
\ No newline at end of file
diff --git a/5-WPF模板和自定义元素/AssemblyInfo.cs b/5-17.1理解逻辑树和可视化树/AssemblyInfo.cs
similarity index 100%
rename from 5-WPF模板和自定义元素/AssemblyInfo.cs
rename to 5-17.1理解逻辑树和可视化树/AssemblyInfo.cs
diff --git a/5-WPF模板和自定义元素/MainWindow.xaml b/5-17.1理解逻辑树和可视化树/MainWindow.xaml
similarity index 100%
rename from 5-WPF模板和自定义元素/MainWindow.xaml
rename to 5-17.1理解逻辑树和可视化树/MainWindow.xaml
diff --git a/5-WPF模板和自定义元素/MainWindow.xaml.cs b/5-17.1理解逻辑树和可视化树/MainWindow.xaml.cs
similarity index 100%
rename from 5-WPF模板和自定义元素/MainWindow.xaml.cs
rename to 5-17.1理解逻辑树和可视化树/MainWindow.xaml.cs
diff --git a/5-WPF模板和自定义元素/VisualTreeDisplayWindow.xaml b/5-17.1理解逻辑树和可视化树/VisualTreeDisplayWindow.xaml
similarity index 100%
rename from 5-WPF模板和自定义元素/VisualTreeDisplayWindow.xaml
rename to 5-17.1理解逻辑树和可视化树/VisualTreeDisplayWindow.xaml
diff --git a/5-WPF模板和自定义元素/VisualTreeDisplayWindow.xaml.cs b/5-17.1理解逻辑树和可视化树/VisualTreeDisplayWindow.xaml.cs
similarity index 100%
rename from 5-WPF模板和自定义元素/VisualTreeDisplayWindow.xaml.cs
rename to 5-17.1理解逻辑树和可视化树/VisualTreeDisplayWindow.xaml.cs
diff --git a/5-WPF模板和自定义元素/5-WPF模板和自定义元素.csproj b/5-17.2理解模板/5-17.2理解模板.csproj
similarity index 81%
rename from 5-WPF模板和自定义元素/5-WPF模板和自定义元素.csproj
rename to 5-17.2理解模板/5-17.2理解模板.csproj
index 0c446de..f4d2b5f 100644
--- a/5-WPF模板和自定义元素/5-WPF模板和自定义元素.csproj
+++ b/5-17.2理解模板/5-17.2理解模板.csproj
@@ -3,7 +3,7 @@
WinExe
net8.0-windows
- _5_WPF模板和自定义元素
+ _5_17._2理解模板
enable
enable
true
diff --git a/5-17.2理解模板/App.xaml b/5-17.2理解模板/App.xaml
new file mode 100644
index 0000000..44c9df7
--- /dev/null
+++ b/5-17.2理解模板/App.xaml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/5-WPF模板和自定义元素/App.xaml.cs b/5-17.2理解模板/App.xaml.cs
similarity index 80%
rename from 5-WPF模板和自定义元素/App.xaml.cs
rename to 5-17.2理解模板/App.xaml.cs
index 6213ac9..e65b0fe 100644
--- a/5-WPF模板和自定义元素/App.xaml.cs
+++ b/5-17.2理解模板/App.xaml.cs
@@ -2,7 +2,7 @@
using System.Data;
using System.Windows;
-namespace _5_WPF模板和自定义元素;
+namespace _5_17._2理解模板;
///
/// Interaction logic for App.xaml
diff --git a/5-17.2理解模板/AssemblyInfo.cs b/5-17.2理解模板/AssemblyInfo.cs
new file mode 100644
index 0000000..4a05c7d
--- /dev/null
+++ b/5-17.2理解模板/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+ ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+ //(used if a resource is not found in the page,
+ // or application resource dictionaries)
+ ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+ //(used if a resource is not found in the page,
+ // app, or any theme specific resource dictionaries)
+)]
\ No newline at end of file
diff --git a/5-17.2理解模板/MainWindow.xaml b/5-17.2理解模板/MainWindow.xaml
new file mode 100644
index 0000000..63ce781
--- /dev/null
+++ b/5-17.2理解模板/MainWindow.xaml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/5-17.2理解模板/MainWindow.xaml.cs b/5-17.2理解模板/MainWindow.xaml.cs
new file mode 100644
index 0000000..09688ae
--- /dev/null
+++ b/5-17.2理解模板/MainWindow.xaml.cs
@@ -0,0 +1,23 @@
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace _5_17._2理解模板;
+
+///
+/// Interaction logic for MainWindow.xaml
+///
+public partial class MainWindow : Window
+{
+ public MainWindow()
+ {
+ InitializeComponent();
+ }
+}
\ No newline at end of file
diff --git a/5-WPF模板和自定义元素.sln b/5-WPF模板和自定义元素.sln
index 264db2f..6b9ee07 100644
--- a/5-WPF模板和自定义元素.sln
+++ b/5-WPF模板和自定义元素.sln
@@ -1,6 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "5-WPF模板和自定义元素", "5-WPF模板和自定义元素\5-WPF模板和自定义元素.csproj", "{8A23D3B8-8A39-41B7-A7E7-59DE38318ED3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "5-17.2理解模板", "5-17.2理解模板\5-17.2理解模板.csproj", "{2A1A5089-F23B-4742-AC20-E082C0816E9F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "5-17.1理解逻辑树和可视化树", "5-17.1理解逻辑树和可视化树\5-17.1理解逻辑树和可视化树.csproj", "{9A8CFF92-191D-4188-8869-64E526351AA4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -8,9 +10,13 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8A23D3B8-8A39-41B7-A7E7-59DE38318ED3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8A23D3B8-8A39-41B7-A7E7-59DE38318ED3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8A23D3B8-8A39-41B7-A7E7-59DE38318ED3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8A23D3B8-8A39-41B7-A7E7-59DE38318ED3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2A1A5089-F23B-4742-AC20-E082C0816E9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2A1A5089-F23B-4742-AC20-E082C0816E9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2A1A5089-F23B-4742-AC20-E082C0816E9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2A1A5089-F23B-4742-AC20-E082C0816E9F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9A8CFF92-191D-4188-8869-64E526351AA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9A8CFF92-191D-4188-8869-64E526351AA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9A8CFF92-191D-4188-8869-64E526351AA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9A8CFF92-191D-4188-8869-64E526351AA4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal