From 77e9b293884947d2fb1d424cf89c8e7d93eff101 Mon Sep 17 00:00:00 2001
From: Tim Miller <drasticactions@users.noreply.github.com>
Date: Fri, 1 Aug 2025 18:17:35 +0900
Subject: [PATCH] Use VisualBrush for GroupBox (#19372)

---
 .../Controls/GroupBox.xaml                    | 23 +++++++++++--------
 .../Controls/GroupBox.xaml                    | 23 +++++++++++--------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/GroupBox.xaml b/src/Avalonia.Themes.Fluent/Controls/GroupBox.xaml
index cd0610944b..1fee84269d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/GroupBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/GroupBox.xaml
@@ -33,16 +33,19 @@
                     CornerRadius="{TemplateBinding CornerRadius}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     BorderBrush="{TemplateBinding BorderBrush}">
-              <Border.Clip>
-                <CombinedGeometry GeometryCombineMode="Exclude">
-                  <CombinedGeometry.Geometry1>
-                    <RectangleGeometry Rect="{Binding #RootGrid.Bounds}" />
-                  </CombinedGeometry.Geometry1>
-                  <CombinedGeometry.Geometry2>
-                    <RectangleGeometry Rect="{Binding #Header.Bounds}" />
-                  </CombinedGeometry.Geometry2>
-                </CombinedGeometry>
-              </Border.Clip>
+              <Border.OpacityMask>
+                <VisualBrush>
+                  <VisualBrush.Visual>
+                    <Canvas Background="Transparent">
+                      <Rectangle Fill="Transparent"
+                                Width="{Binding #Header.Bounds.Width}"
+                                Height="{Binding #Header.Bounds.Height}"
+                                Canvas.Left="{Binding #Header.Bounds.X}"
+                                Canvas.Top="{Binding #Header.Bounds.Y}"/>
+                    </Canvas>
+                  </VisualBrush.Visual>
+                </VisualBrush>
+              </Border.OpacityMask>
             </Border>
 
             <!-- ContentPresenter for the header -->
diff --git a/src/Avalonia.Themes.Simple/Controls/GroupBox.xaml b/src/Avalonia.Themes.Simple/Controls/GroupBox.xaml
index 2285128c12..6267e3731c 100644
--- a/src/Avalonia.Themes.Simple/Controls/GroupBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/GroupBox.xaml
@@ -31,16 +31,19 @@
                     CornerRadius="{TemplateBinding CornerRadius}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     BorderBrush="{TemplateBinding BorderBrush}">
-              <Border.Clip>
-                <CombinedGeometry GeometryCombineMode="Exclude">
-                  <CombinedGeometry.Geometry1>
-                    <RectangleGeometry Rect="{Binding #RootGrid.Bounds}" />
-                  </CombinedGeometry.Geometry1>
-                  <CombinedGeometry.Geometry2>
-                    <RectangleGeometry Rect="{Binding #Header.Bounds}" />
-                  </CombinedGeometry.Geometry2>
-                </CombinedGeometry>
-              </Border.Clip>
+              <Border.OpacityMask>
+                <VisualBrush>
+                  <VisualBrush.Visual>
+                    <Canvas Background="Transparent">
+                      <Rectangle Fill="Transparent"
+                                Width="{Binding #Header.Bounds.Width}"
+                                Height="{Binding #Header.Bounds.Height}"
+                                Canvas.Left="{Binding #Header.Bounds.X}"
+                                Canvas.Top="{Binding #Header.Bounds.Y}"/>
+                    </Canvas>
+                  </VisualBrush.Visual>
+                </VisualBrush>
+              </Border.OpacityMask>
             </Border>
 
             <!-- ContentPresenter for the header -->