GithubStar/AtomUI
1
0
Fork 0
mirror of https://github.com/AtomUI/AtomUI.git synced 2026-10-25 02:30:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ScopeAwareAdornerLayer

Browse Source
This commit is contained in:
chinboy
2025-02-28 13:40:52 +08:00
parent 3070d62cf9
commit 0b848c8bac
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AtomUI.Controls/Primitives/ScopeAwareAdornerLayer.cs
+1 -10
View File
@@ -45,16 +45,12 @@ public class ScopeAwareAdornerLayer : Canvas
private static readonly AttachedProperty<ScopeAwareAdornerLayer?> SavedAdornerLayerProperty =
AvaloniaProperty.RegisterAttached<Visual, Visual, ScopeAwareAdornerLayer?>("SavedAdornerLayer");
private static readonly MethodInfo AddLayerMethodInfo;
#endregion
static ScopeAwareAdornerLayer()
{
AdornedElementProperty.Changed.Subscribe(HandleAdornedElementChanged);
AdornerProperty.Changed.Subscribe(HandleAdornerChanged);
AddLayerMethodInfo =
typeof(VisualLayerManager).GetMethod("AddLayer", BindingFlags.Instance | BindingFlags.NonPublic)!;
}
public ScopeAwareAdornerLayer()
@@ -333,11 +329,6 @@ public class ScopeAwareAdornerLayer : Canvas
}
}
private static void AddLayerToVisualLayerManager(VisualLayerManager visualLayerManager, Control layer, int zindex)
{
AddLayerMethodInfo.Invoke(visualLayerManager, [layer, zindex]);
}
private static ScopeAwareAdornerLayer InjectLayer(Layoutable layerHost)
{
var layer = FindAdornerLayer(layerHost);
@@ -356,7 +347,7 @@ public class ScopeAwareAdornerLayer : Canvas
layer.LayerHost = layerHost;
if (layerHost is VisualLayerManager visualLayerManager)
{
AddLayerToVisualLayerManager(visualLayerManager, layer, visualLayerManager.ZIndex);
visualLayerManager.AddLayer(layer, visualLayerManager.ZIndex);
}
else if (layerHost is ScrollContentPresenter scrollContentPresenter)
{
src/AtomUI.Controls/Utils/VisualLayerManagerReflectionExtensions.cs
+22
View File
@@ -0,0 +1,22 @@
using System.Reflection;
using AtomUI.Reflection;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
namespace AtomUI.Controls.Utils;
internal static class VisualLayerManagerReflectionExtensions
{
#region 反射信息定义
private static readonly Lazy<MethodInfo> AddLayerMethodInfo = new Lazy<MethodInfo>(() =>
typeof(VisualLayerManager).GetMethodInfoOrThrow("AddLayer",
BindingFlags.Instance | BindingFlags.NonPublic));
#endregion
public static void AddLayer(this VisualLayerManager visualLayerManager, Control layer, int zindex)
{
AddLayerMethodInfo.Value.Invoke(visualLayerManager, [layer, zindex]);
}
}