From 2f431b957043b53f98ecde0231fa3a36290416cf Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Wed, 14 Dec 2022 12:38:32 +0100
Subject: [PATCH 1/2] fix: Warning CS0436

---
 src/Avalonia.X11/Avalonia.X11.csproj | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.X11/Avalonia.X11.csproj b/src/Avalonia.X11/Avalonia.X11.csproj
index c762349c1c..061c516ef6 100644
--- a/src/Avalonia.X11/Avalonia.X11.csproj
+++ b/src/Avalonia.X11/Avalonia.X11.csproj
@@ -10,7 +10,12 @@
         <ProjectReference Include="..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
         <ProjectReference Include="..\Avalonia.FreeDesktop\Avalonia.FreeDesktop.csproj" />
         <Compile Include="..\Shared\RawEventGrouping.cs" />
-    </ItemGroup>
-    <Import Project="..\..\build\SourceGenerators.props" />
-    <Import Project="..\..\build\TrimmingEnable.props" />
+  </ItemGroup>
+  <Import Project="..\..\build\SourceGenerators.props" />
+  <Import Project="..\..\build\TrimmingEnable.props" />
+
+  <ItemGroup>
+    <Compile Remove="..\Shared\SourceGeneratorAttributes.cs"/>
+    <None Include="..\Shared\SourceGeneratorAttributes.cs" Visible="false"/>
+  </ItemGroup>
 </Project>

From 78b4c6a96e80b8ac6f9a103c71154bd3d8caea20 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sun, 1 Jan 2023 20:25:26 +0600
Subject: [PATCH 2/2] Ignore Opacity for hit-testing purposes

---
 .../Server/ServerCompositionVisual.cs         | 13 ++++++--
 .../Rendering/CompositorHitTestingTests.cs    | 33 +++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
index 0e15cbd54b..c4f0ebcd3b 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
@@ -162,8 +162,14 @@ namespace Avalonia.Rendering.Composition.Server
             
             EffectiveOpacity = Opacity * (Parent?.EffectiveOpacity ?? 1);
 
-            IsVisibleInFrame = _parent?.IsVisibleInFrame != false && Visible && EffectiveOpacity > 0.04 && !_isBackface &&
-                               !_combinedTransformedClipBounds.IsDefault;
+            IsHitTestVisibleInFrame = _parent?.IsHitTestVisibleInFrame != false
+                                      && Visible
+                                      && !_isBackface
+                                      && !_combinedTransformedClipBounds.IsDefault;
+
+            IsVisibleInFrame = IsHitTestVisibleInFrame
+                               && _parent?.IsVisibleInFrame != false
+                               && EffectiveOpacity > 0.04;
 
             if (wasVisible != IsVisibleInFrame || positionChanged)
             {
@@ -187,7 +193,7 @@ namespace Avalonia.Rendering.Composition.Server
             readback.Revision = root.Revision;
             readback.Matrix = GlobalTransformMatrix;
             readback.TargetId = Root.Id;
-            readback.Visible = IsVisibleInFrame;
+            readback.Visible = IsHitTestVisibleInFrame;
         }
 
         void AddDirtyRect(Rect rc)
@@ -248,6 +254,7 @@ namespace Avalonia.Rendering.Composition.Server
         }
 
         public bool IsVisibleInFrame { get; set; }
+        public bool IsHitTestVisibleInFrame { get; set; }
         public double EffectiveOpacity { get; set; }
         public Rect TransformedOwnContentBounds { get; set; }
         public virtual Rect OwnContentBounds => new Rect(0, 0, Size.X, Size.Y);
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
index 27faf1e13c..3d8369faeb 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
@@ -82,6 +82,39 @@ public class CompositorHitTestingTests : CompositorTestsBase
         }
     }
     
+    [Theory,
+        InlineData(false, false),
+        InlineData(true, false),
+        InlineData(false, true),
+        InlineData(true, true),
+    ]
+    public void HitTest_Should_Find_Zero_Opacity_Controls_At_Point(bool parent, bool child)
+    {
+        
+        using (var s = new CompositorServices(new Size(200, 200)))
+        {
+            Border visible, border;
+            s.TopLevel.Content = border = new Border
+            {
+                Width = 100,
+                Height = 100,
+                Background = Brushes.Red,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Opacity = parent ? 0 : 1,
+                Child = visible = new Border
+                {
+                    Opacity = child ? 0 : 1,
+                    Background = Brushes.Red,
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                }
+            };
+
+            s.AssertHitTest(new Point(100, 100), null, visible, border);
+        }
+    }
+    
     [Fact]
     public void HitTest_Should_Not_Find_Control_Outside_Point()
     {