From 88cecc95e921b06d28d887c0ee3c2a4f8a7ad0cb Mon Sep 17 00:00:00 2001
From: Bunny <1319900154@qq.com>
Date: Mon, 30 Dec 2024 16:46:44 +0800
Subject: [PATCH] =?UTF-8?q?WPF=E5=9F=BA=E7=A1=80-6-Grid6=E8=B7=A8=E8=A1=8C?=
 =?UTF-8?q?=E5=92=8C=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WPF基础-6-Grid6跨行和列/App.xaml              |  9 +++++++
 WPF基础-6-Grid6跨行和列/App.xaml.cs           | 12 +++++++++
 WPF基础-6-Grid6跨行和列/AssemblyInfo.cs       | 10 ++++++++
 WPF基础-6-Grid6跨行和列/MainWindow.xaml       | 25 +++++++++++++++++++
 WPF基础-6-Grid6跨行和列/MainWindow.xaml.cs    | 23 +++++++++++++++++
 .../WPF基础-6-Grid6跨行和列.csproj            | 12 +++++++++
 WPF基础.sln                                   |  6 +++++
 7 files changed, 97 insertions(+)
 create mode 100644 WPF基础-6-Grid6跨行和列/App.xaml
 create mode 100644 WPF基础-6-Grid6跨行和列/App.xaml.cs
 create mode 100644 WPF基础-6-Grid6跨行和列/AssemblyInfo.cs
 create mode 100644 WPF基础-6-Grid6跨行和列/MainWindow.xaml
 create mode 100644 WPF基础-6-Grid6跨行和列/MainWindow.xaml.cs
 create mode 100644 WPF基础-6-Grid6跨行和列/WPF基础-6-Grid6跨行和列.csproj

diff --git a/WPF基础-6-Grid6跨行和列/App.xaml b/WPF基础-6-Grid6跨行和列/App.xaml
new file mode 100644
index 0000000..aede0f9
--- /dev/null
+++ b/WPF基础-6-Grid6跨行和列/App.xaml
@@ -0,0 +1,9 @@
+<Application x:Class="WPF基础_6_Grid6跨行和列.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:WPF基础_6_Grid6跨行和列"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/WPF基础-6-Grid6跨行和列/App.xaml.cs b/WPF基础-6-Grid6跨行和列/App.xaml.cs
new file mode 100644
index 0000000..b29e810
--- /dev/null
+++ b/WPF基础-6-Grid6跨行和列/App.xaml.cs
@@ -0,0 +1,12 @@
+using System.Configuration;
+using System.Data;
+using System.Windows;
+
+namespace WPF基础_6_Grid6跨行和列;
+
+/// <summary>
+/// Interaction logic for App.xaml
+/// </summary>
+public partial class App : Application
+{
+}
\ No newline at end of file
diff --git a/WPF基础-6-Grid6跨行和列/AssemblyInfo.cs b/WPF基础-6-Grid6跨行和列/AssemblyInfo.cs
new file mode 100644
index 0000000..4a05c7d
--- /dev/null
+++ b/WPF基础-6-Grid6跨行和列/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/WPF基础-6-Grid6跨行和列/MainWindow.xaml b/WPF基础-6-Grid6跨行和列/MainWindow.xaml
new file mode 100644
index 0000000..1bfc257
--- /dev/null
+++ b/WPF基础-6-Grid6跨行和列/MainWindow.xaml
@@ -0,0 +1,25 @@
+<Window x:Class="WPF基础_6_Grid6跨行和列.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="450" Width="800">
+    <Grid ShowGridLines="True" UseLayoutRounding="True">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <Button Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Background="Aquamarine">占了两个空格</Button>
+        <Button Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Background="Red">占了3个</Button>
+        <Button Grid.Row="1" Grid.Column="0" Grid.RowSpan="2" Background="Yellow">占了两个上下空格</Button>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/WPF基础-6-Grid6跨行和列/MainWindow.xaml.cs b/WPF基础-6-Grid6跨行和列/MainWindow.xaml.cs
new file mode 100644
index 0000000..7a10b86
--- /dev/null
+++ b/WPF基础-6-Grid6跨行和列/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 WPF基础_6_Grid6跨行和列;
+
+/// <summary>
+/// Interaction logic for MainWindow.xaml
+/// </summary>
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/WPF基础-6-Grid6跨行和列/WPF基础-6-Grid6跨行和列.csproj b/WPF基础-6-Grid6跨行和列/WPF基础-6-Grid6跨行和列.csproj
new file mode 100644
index 0000000..109b209
--- /dev/null
+++ b/WPF基础-6-Grid6跨行和列/WPF基础-6-Grid6跨行和列.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net8.0-windows</TargetFramework>
+        <RootNamespace>WPF基础_6_Grid6跨行和列</RootNamespace>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <UseWPF>true</UseWPF>
+    </PropertyGroup>
+
+</Project>
diff --git a/WPF基础.sln b/WPF基础.sln
index 44a4ca6..017f897 100644
--- a/WPF基础.sln
+++ b/WPF基础.sln
@@ -32,6 +32,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPF基础-6-Grid4对话框"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPF基础-6-Grid5反锯齿模糊问题", "WPF基础-6-Grid5反锯齿模糊问题\WPF基础-6-Grid5反锯齿模糊问题.csproj", "{F6C2DF99-F63F-472C-95D6-7FDAF5AD4D72}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPF基础-6-Grid6跨行和列", "WPF基础-6-Grid6跨行和列\WPF基础-6-Grid6跨行和列.csproj", "{F8D3CE0C-01D6-4046-B24A-BA09A7EC298E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -102,5 +104,9 @@ Global
 		{F6C2DF99-F63F-472C-95D6-7FDAF5AD4D72}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F6C2DF99-F63F-472C-95D6-7FDAF5AD4D72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F6C2DF99-F63F-472C-95D6-7FDAF5AD4D72}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8D3CE0C-01D6-4046-B24A-BA09A7EC298E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8D3CE0C-01D6-4046-B24A-BA09A7EC298E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8D3CE0C-01D6-4046-B24A-BA09A7EC298E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8D3CE0C-01D6-4046-B24A-BA09A7EC298E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal