From 708c8a1c294fb54918dc5875071ab49fffe3c16c Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Mon, 6 Mar 2023 12:32:18 +0100
Subject: [PATCH] Add missing ClipToBounds for inner Grid

---
 src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml | 4 +++-
 src/Avalonia.Controls.DataGrid/Themes/Simple.xaml | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index ca516c8918..e4642c1453 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -516,7 +516,9 @@
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
                   CornerRadius="{TemplateBinding CornerRadius}">
-            <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="Auto,*,Auto,Auto">
+            <Grid ColumnDefinitions="Auto,*,Auto" 
+                  RowDefinitions="Auto,*,Auto,Auto"
+                  ClipToBounds="True">
               <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
                                     Theme="{StaticResource DataGridTopLeftColumnHeader}" />
               <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml b/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
index 464a12770e..36e648db6b 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
@@ -319,7 +319,8 @@
                   BorderThickness="{TemplateBinding BorderThickness}"
                   CornerRadius="{TemplateBinding CornerRadius}">
             <Grid ColumnDefinitions="Auto,*,Auto"
-                  RowDefinitions="Auto,*,Auto,Auto">
+                  RowDefinitions="Auto,*,Auto,Auto"
+                  ClipToBounds="True">
               <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
                                     Width="22" />
               <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"