Move ControlRecyclingProperty

wieslawsoltes · Sep 23, 2024 · d75c9b8 · d75c9b8
1 parent f4322c5
commit d75c9b8
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 35 deletions.
diff --git a/samples/DockMvvmSample/App.axaml b/samples/DockMvvmSample/App.axaml
@@ -1,7 +1,6 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:DockMvvmSample"
-             xmlns:ids="using:Dock.Settings"
              xmlns:idc="using:Dock.Avalonia.Controls"
              xmlns:idcr="using:Dock.Avalonia.Controls.Recycling"
              xmlns:core="using:Dock.Model.Core"
@@ -19,7 +18,7 @@
   <Application.Styles>
 
     <Style Selector="idc|DockControl">
-      <Setter Property="(ids:DockProperties.ControlRecycling)" Value="{StaticResource ControlRecyclingKey}" />
+      <Setter Property="(idcr:ControlRecyclingDataTemplate.ControlRecycling)" Value="{StaticResource ControlRecyclingKey}" />
     </Style>
 
     <Style Selector="idc|DocumentControl">

diff --git a/samples/DockXamlSample/App.axaml b/samples/DockXamlSample/App.axaml
@@ -1,7 +1,6 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="DockXamlSample.App"
-             xmlns:ids="using:Dock.Settings"
              xmlns:idc="using:Dock.Avalonia.Controls"
              xmlns:idcr="using:Dock.Avalonia.Controls.Recycling"
              Name="Dock Avalonia Demo"
@@ -24,7 +23,7 @@
     </Style>
 
     <Style Selector="idc|DockControl">
-      <Setter Property="(ids:DockProperties.ControlRecycling)" Value="{StaticResource ControlRecyclingKey}" />
+      <Setter Property="(idcr:ControlRecyclingDataTemplate.ControlRecycling)" Value="{StaticResource ControlRecyclingKey}" />
     </Style>
 
   </Application.Styles>

diff --git a/samples/Notepad/App.axaml b/samples/Notepad/App.axaml
@@ -1,7 +1,6 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:Notepad"
-             xmlns:ids="using:Dock.Settings"
              xmlns:idc="using:Dock.Avalonia.Controls"
              xmlns:idcr="using:Dock.Avalonia.Controls.Recycling"
              x:Class="Notepad.App"
@@ -23,7 +22,7 @@
     <StyleInclude Source="avares://Dock.Avalonia/Themes/DockFluentTheme.axaml" />
 
     <Style Selector="idc|DockControl">
-      <Setter Property="(ids:DockProperties.ControlRecycling)" Value="{StaticResource ControlRecyclingKey}" />
+      <Setter Property="(idcr:ControlRecyclingDataTemplate.ControlRecycling)" Value="{StaticResource ControlRecyclingKey}" />
     </Style>
 
   </Application.Styles>

diff --git a/src/Dock.Avalonia/Controls/Recycling/RecylingDataTemplate.cs b/src/Dock.Avalonia/Controls/Recycling/RecylingDataTemplate.cs
@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
+using Avalonia.Data;
 using Dock.Model.Core;
 using Dock.Settings;
 
@@ -11,6 +12,16 @@ namespace Dock.Avalonia.Controls.Recycling;
 /// </summary>
 public class ControlRecyclingDataTemplate : AvaloniaObject, IRecyclingDataTemplate
 {
+    /// <summary>
+    /// Defines the ControlRecycling attached property.
+    /// </summary>
+    public static readonly AttachedProperty<IControlRecycling?> ControlRecyclingProperty =
+        AvaloniaProperty.RegisterAttached<ControlRecyclingDataTemplate, Control, IControlRecycling?>(
+            "ControlRecycling",
+            null, 
+            true, 
+            BindingMode.TwoWay);
+
     /// <summary>
     /// 
     /// </summary>
@@ -26,6 +37,26 @@ public Control? Parent
         set => SetValue(ParentProperty, value);
     }
 
+    /// <summary>
+    /// Gets the value of the ControlRecycling attached property on the specified control.
+    /// </summary>
+    /// <param name="control">The control.</param>
+    /// <returns>The ControlRecycling attached property.</returns>
+    public static IControlRecycling? GetControlRecycling(AvaloniaObject control)
+    {
+        return control.GetValue(ControlRecyclingProperty);
+    }
+
+    /// <summary>
+    /// Sets the value of the ControlRecycling attached property on the specified control.
+    /// </summary>
+    /// <param name="control">The control.</param>
+    /// <param name="value">The value of the ControlRecycling property.</param>
+    public static void SetControlRecycling(AvaloniaObject control, IControlRecycling? value)
+    {
+        control.SetValue(ControlRecyclingProperty, value);
+    }
+
     /// <summary>
     /// 
     /// </summary>
@@ -59,7 +90,7 @@ public bool Match(object? data)
             return null;
         }
 
-        var controlRecycling = DockProperties.GetControlRecycling(parent);
+        var controlRecycling = ControlRecyclingDataTemplate.GetControlRecycling(parent);
         if (controlRecycling is not null)
         {
             return controlRecycling.Build(data, existing, parent) as Control;

diff --git a/src/Dock.Model.Avalonia/Controls/TemplateHelper.cs b/src/Dock.Model.Avalonia/Controls/TemplateHelper.cs
@@ -3,6 +3,7 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Markup.Xaml.Templates;
+using Dock.Avalonia.Controls.Recycling;
 using Dock.Settings;
 
 namespace Dock.Model.Avalonia.Controls;
@@ -16,7 +17,7 @@ internal static class TemplateHelper
             return null;
         }
 
-        var controlRecycling = DockProperties.GetControlRecycling(parent);
+        var controlRecycling = ControlRecyclingDataTemplate.GetControlRecycling(parent);
         if (controlRecycling is not null)
         {
             if (controlRecycling.TryGetValue(content, out var control))

diff --git a/src/Dock.Model.Avalonia/Dock.Model.Avalonia.csproj b/src/Dock.Model.Avalonia/Dock.Model.Avalonia.csproj
@@ -19,6 +19,7 @@
   <Import Project="..\..\build\System.Text.Json.props" />
 
   <ItemGroup>
+    <ProjectReference Include="..\Dock.Avalonia\Dock.Avalonia.csproj" />
     <ProjectReference Include="..\Dock.Model\Dock.Model.csproj" />
     <ProjectReference Include="..\Dock.Settings\Dock.Settings.csproj" />
   </ItemGroup>

diff --git a/src/Dock.Settings/DockProperties.cs b/src/Dock.Settings/DockProperties.cs
@@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data;
-using Dock.Model.Core;
 
 namespace Dock.Settings;
 
@@ -10,12 +9,6 @@ namespace Dock.Settings;
 /// </summary>
 public class DockProperties : AvaloniaObject
 {
-    /// <summary>
-    /// Defines the ControlRecycling attached property.
-    /// </summary>
-    public static readonly AttachedProperty<IControlRecycling?> ControlRecyclingProperty =
-        AvaloniaProperty.RegisterAttached<DockProperties, Control, IControlRecycling?>("ControlRecycling", null, true, BindingMode.TwoWay);
-
     /// <summary>
     /// Defines the IsDockTarget attached property.
     /// </summary>
@@ -46,26 +39,6 @@ public class DockProperties : AvaloniaObject
     public static readonly StyledProperty<bool> IsDropEnabledProperty =
         AvaloniaProperty.RegisterAttached<DockProperties, Control, bool>("IsDropEnabled", true, true, BindingMode.TwoWay);
 
-    /// <summary>
-    /// Gets the value of the ControlRecycling attached property on the specified control.
-    /// </summary>
-    /// <param name="control">The control.</param>
-    /// <returns>The ControlRecycling attached property.</returns>
-    public static IControlRecycling? GetControlRecycling(AvaloniaObject control)
-    {
-        return control.GetValue(ControlRecyclingProperty);
-    }
-
-    /// <summary>
-    /// Sets the value of the ControlRecycling attached property on the specified control.
-    /// </summary>
-    /// <param name="control">The control.</param>
-    /// <param name="value">The value of the ControlRecycling property.</param>
-    public static void SetControlRecycling(AvaloniaObject control, IControlRecycling? value)
-    {
-        control.SetValue(ControlRecyclingProperty, value);
-    }
-
     /// <summary>
     /// Gets the value of the IsDockTarget attached property on the specified control.
     /// </summary>