Updated

wieslawsoltes · Mar 19, 2020 · 3b5607c · 3b5607c
1 parent 1cab1ff
commit 3b5607c
Show file tree

Hide file tree

Showing 28 changed files with 100 additions and 73 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.0.100
+        dotnet-version: 3.1.102
     - name: Build
       run: dotnet build -c Release
     - name: Test
@@ -46,38 +46,38 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.0.100
+        dotnet-version: 3.1.102
     - name: Publish
       if: github.event_name != 'pull_request'
       run: |
-        dotnet publish -c Release -f netcoreapp3.0 -r win7-x64 -o ./artifacts/AvaloniaDemo-netcoreapp3.0-win7-x64 ./samples/AvaloniaDemo/AvaloniaDemo.csproj
-        dotnet publish -c Release -f netcoreapp3.0 -r win7-x64 -o ./artifacts/AvaloniaDemo.Experimental-netcoreapp3.0-win7-x64 ./samples/AvaloniaDemo.Experimental/AvaloniaDemo.Experimental.csproj
-        dotnet publish -c Release -f netcoreapp3.0 -r win7-x64 -o ./artifacts/AvaloniaDemo.Perspectives-netcoreapp3.0-win7-x64 ./samples/AvaloniaDemo.Perspectives/AvaloniaDemo.Perspectives.csproj
-        dotnet publish -c Release -f netcoreapp3.0 -r win7-x64 -o ./artifacts/Notepad-netcoreapp3.0-win7-x64 ./samples/Notepad/Notepad.csproj
+        dotnet publish -c Release -f netcoreapp3.1 -r win7-x64 -o ./artifacts/AvaloniaDemo-netcoreapp3.1-win7-x64 ./samples/AvaloniaDemo/AvaloniaDemo.csproj
+        dotnet publish -c Release -f netcoreapp3.1 -r win7-x64 -o ./artifacts/AvaloniaDemo.Experimental-netcoreapp3.1-win7-x64 ./samples/AvaloniaDemo.Experimental/AvaloniaDemo.Experimental.csproj
+        dotnet publish -c Release -f netcoreapp3.1 -r win7-x64 -o ./artifacts/AvaloniaDemo.Perspectives-netcoreapp3.1-win7-x64 ./samples/AvaloniaDemo.Perspectives/AvaloniaDemo.Perspectives.csproj
+        dotnet publish -c Release -f netcoreapp3.1 -r win7-x64 -o ./artifacts/Notepad-netcoreapp3.1-win7-x64 ./samples/Notepad/Notepad.csproj
     - name: Artifacts
       if: github.event_name != 'pull_request'
       uses: actions/upload-artifact@master
       with:
-        name: AvaloniaDemo-netcoreapp3.0-win7-x64
-        path: ./artifacts/AvaloniaDemo-netcoreapp3.0-win7-x64
+        name: AvaloniaDemo-netcoreapp3.1-win7-x64
+        path: ./artifacts/AvaloniaDemo-netcoreapp3.1-win7-x64
     - name: Artifacts
       if: github.event_name != 'pull_request'
       uses: actions/upload-artifact@master
       with:
-        name: AvaloniaDemo.Experimental-netcoreapp3.0-win7-x64
-        path: ./artifacts/AvaloniaDemo.Experimental-netcoreapp3.0-win7-x64
+        name: AvaloniaDemo.Experimental-netcoreapp3.1-win7-x64
+        path: ./artifacts/AvaloniaDemo.Experimental-netcoreapp3.1-win7-x64
     - name: Artifacts
       if: github.event_name != 'pull_request'
       uses: actions/upload-artifact@master
       with:
-        name: AvaloniaDemo.Perspectives-netcoreapp3.0-win7-x64
-        path: ./artifacts/AvaloniaDemo.Perspectives-netcoreapp3.0-win7-x64
+        name: AvaloniaDemo.Perspectives-netcoreapp3.1-win7-x64
+        path: ./artifacts/AvaloniaDemo.Perspectives-netcoreapp3.1-win7-x64
     - name: Artifacts
       if: github.event_name != 'pull_request'
       uses: actions/upload-artifact@master
       with:
-        name: Notepad-netcoreapp3.0-win7-x64
-        path: ./artifacts/Notepad-netcoreapp3.0-win7-x64
+        name: Notepad-netcoreapp3.1-win7-x64
+        path: ./artifacts/Notepad-netcoreapp3.1-win7-x64
 
   publish-ubuntu:
     name: Publish ubuntu-latest
@@ -87,24 +87,24 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.0.100
+        dotnet-version: 3.1.102
     - name: Publish
       if: github.event_name != 'pull_request'
       run: |
-        dotnet publish -c Release -f netcoreapp3.0 -r debian.8-x64 -o ./artifacts/AvaloniaDemo-netcoreapp3.0-debian.8-x64 ./samples/AvaloniaDemo/AvaloniaDemo.csproj
-        dotnet publish -c Release -f netcoreapp3.0 -r ubuntu.14.04-x64 -o ./artifacts/AvaloniaDemo-netcoreapp3.0-ubuntu.14.04-x64 ./samples/AvaloniaDemo/AvaloniaDemo.csproj
+        dotnet publish -c Release -f netcoreapp3.1 -r debian.8-x64 -o ./artifacts/AvaloniaDemo-netcoreapp3.1-debian.8-x64 ./samples/AvaloniaDemo/AvaloniaDemo.csproj
+        dotnet publish -c Release -f netcoreapp3.1 -r ubuntu.14.04-x64 -o ./artifacts/AvaloniaDemo-netcoreapp3.1-ubuntu.14.04-x64 ./samples/AvaloniaDemo/AvaloniaDemo.csproj
     - name: Artifacts
       if: github.event_name != 'pull_request'
       uses: actions/upload-artifact@master
       with:
-        name: AvaloniaDemo-netcoreapp3.0-debian.8-x64
-        path: ./artifacts/AvaloniaDemo-netcoreapp3.0-debian.8-x64
+        name: AvaloniaDemo-netcoreapp3.1-debian.8-x64
+        path: ./artifacts/AvaloniaDemo-netcoreapp3.1-debian.8-x64
     - name: Artifacts
       if: github.event_name != 'pull_request'
       uses: actions/upload-artifact@master
       with:
-        name: AvaloniaDemo-netcoreapp3.0-ubuntu.14.04-x64
-        path: ./artifacts/AvaloniaDemo-netcoreapp3.0-ubuntu.14.04-x64
+        name: AvaloniaDemo-netcoreapp3.1-ubuntu.14.04-x64
+        path: ./artifacts/AvaloniaDemo-netcoreapp3.1-ubuntu.14.04-x64
 
   publish-macOS:
     name: Publish macOS-latest
@@ -114,13 +114,13 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.0.100
+        dotnet-version: 3.1.102
     - name: Publish
       if: github.event_name != 'pull_request'
-      run: dotnet publish -c Release -f netcoreapp3.0 -r osx.10.12-x64 -o ./artifacts/AvaloniaDemo-netcoreapp3.0-osx.10.12-x64 ./samples/AvaloniaDemo/AvaloniaDemo.csproj
+      run: dotnet publish -c Release -f netcoreapp3.1 -r osx.10.12-x64 -o ./artifacts/AvaloniaDemo-netcoreapp3.1-osx.10.12-x64 ./samples/AvaloniaDemo/AvaloniaDemo.csproj
     - name: Artifacts
       if: github.event_name != 'pull_request'
       uses: actions/upload-artifact@master
       with:
-        name: AvaloniaDemo-netcoreapp3.0-osx.10.12-x64
-        path: ./artifacts/AvaloniaDemo-netcoreapp3.0-osx.10.12-x64
+        name: AvaloniaDemo-netcoreapp3.1-osx.10.12-x64
+        path: ./artifacts/AvaloniaDemo-netcoreapp3.1-osx.10.12-x64
diff --git a/Dock.sln b/Dock.sln
@@ -32,6 +32,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{A2F3E41E-D53C-49A1-9089-2FE2C3F0FE73}"
 	ProjectSection(SolutionItems) = preProject
 		build\Avalonia.Desktop.props = build\Avalonia.Desktop.props
+		build\Avalonia.Diagnostics.props = build\Avalonia.Diagnostics.props
 		build\Avalonia.props = build\Avalonia.props
 		build\Base.props = build\Base.props
 		build\EmbedXaml.props = build\EmbedXaml.props

diff --git a/build/Avalonia.Desktop.props b/build/Avalonia.Desktop.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.4" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.9.999-cibuild*" />
     <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.1" />
   </ItemGroup>

diff --git a/build/Avalonia.Diagnostics.props b/build/Avalonia.Diagnostics.props
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.9.999-cibuild*" />
+  </ItemGroup>
+</Project>
diff --git a/build/Avalonia.props b/build/Avalonia.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.9.4" />
+    <PackageReference Include="Avalonia" Version="0.9.999-cibuild*" />
   </ItemGroup>
 </Project>
diff --git a/build/Base.props b/build/Base.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionPrefix>0.9.4.1</VersionPrefix>
+    <VersionPrefix>0.9.999</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>

diff --git a/build/build/Build.cs b/build/build/Build.cs
@@ -6,6 +6,7 @@
 using Nuke.Common.ProjectModel;
 using Nuke.Common.Tools.DotNet;
 using static Nuke.Common.EnvironmentInfo;
+using Nuke.Common.IO;
 using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.IO.PathConstruction;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;

diff --git a/build/build/_build.csproj b/build/build/_build.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="0.23.4" />
+    <PackageReference Include="Nuke.Common" Version="0.24.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "3.0.100",
+    "version": "3.1.100",
     "rollForward": "latestMajor"
   }
 }
diff --git a/samples/AvaloniaDemo.Experimental/AvaloniaDemo.Experimental.csproj b/samples/AvaloniaDemo.Experimental/AvaloniaDemo.Experimental.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
@@ -24,6 +24,7 @@
   <Import Project="..\..\build\ReferenceAssemblies.props" />
   <Import Project="..\..\build\Avalonia.props" />
   <Import Project="..\..\build\Avalonia.Desktop.props" />
+  <Import Project="..\..\build\Avalonia.Diagnostics.props" />
   <Import Project="..\..\build\Newtonsoft.Json.props" />
 
   <ItemGroup>

diff --git a/samples/AvaloniaDemo.Perspectives/AvaloniaDemo.Perspectives.csproj b/samples/AvaloniaDemo.Perspectives/AvaloniaDemo.Perspectives.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
@@ -24,6 +24,7 @@
   <Import Project="..\..\build\ReferenceAssemblies.props" />
   <Import Project="..\..\build\Avalonia.props" />
   <Import Project="..\..\build\Avalonia.Desktop.props" />
+  <Import Project="..\..\build\Avalonia.Diagnostics.props" />
   <Import Project="..\..\build\Newtonsoft.Json.props" />
 
   <ItemGroup>

diff --git a/samples/AvaloniaDemo/AvaloniaDemo.csproj b/samples/AvaloniaDemo/AvaloniaDemo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
@@ -20,6 +20,7 @@
   <Import Project="..\..\build\ReferenceAssemblies.props" />
   <Import Project="..\..\build\Avalonia.props" />
   <Import Project="..\..\build\Avalonia.Desktop.props" />
+  <Import Project="..\..\build\Avalonia.Diagnostics.props" />
   <Import Project="..\..\build\Newtonsoft.Json.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
 

diff --git a/samples/Notepad/Notepad.csproj b/samples/Notepad/Notepad.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
@@ -20,6 +20,7 @@
   <Import Project="..\..\build\ReferenceAssemblies.props" />
   <Import Project="..\..\build\Avalonia.props" />
   <Import Project="..\..\build\Avalonia.Desktop.props" />
+  <Import Project="..\..\build\Avalonia.Diagnostics.props" />
   <Import Project="..\..\build\Newtonsoft.Json.props" />
   <Import Project="..\..\build\ReactiveUI.props" />
 

diff --git a/samples/ProportionalStackPanelDemo/ProportionalStackPanelDemo.csproj b/samples/ProportionalStackPanelDemo/ProportionalStackPanelDemo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
@@ -20,6 +20,7 @@
   <Import Project="..\..\build\ReferenceAssemblies.props" />
   <Import Project="..\..\build\Avalonia.props" />
   <Import Project="..\..\build\Avalonia.Desktop.props" />
+  <Import Project="..\..\build\Avalonia.Diagnostics.props" />
 
   <ItemGroup>
     <Compile Include="**\*.cs" Exclude="obj\**" />

diff --git a/src/Dock.Avalonia.Themes.Default/DockTarget.xaml b/src/Dock.Avalonia.Themes.Default/DockTarget.xaml
@@ -14,11 +14,11 @@
                     <Grid Background="Purple" ColumnSpan="2" RowSpan="2" Opacity="0" Name="PART_CenterIndicator" />
                     <Grid RowSpan="2" ColumnSpan="2">
                         <Grid MaxWidth="125" MaxHeight="125" RowDefinitions="*,*,*" ColumnDefinitions="*,*,*">
-                            <Image Name="PART_TopSelector" Source="avares://Dock.Avalonia.Themes.Default/Assets/DockAnchorableTop.png" Height="40" Width="40" Grid.Column="1" />
-                            <Image Name="PART_BottomSelector" Source="avares://Dock.Avalonia.Themes.Default/Assets/DockAnchorableBottom.png" Height="40" Width="40" Grid.Row="2" Grid.Column="1" />
-                            <Image Name="PART_LeftSelector" Source="avares://Dock.Avalonia.Themes.Default/Assets/DockAnchorableLeft.png" Height="40" Width="40" Grid.Row="1" />
-                            <Image Name="PART_RightSelector" Source="avares://Dock.Avalonia.Themes.Default/Assets/DockAnchorableRight.png" Height="40" Width="40" Grid.Row="1" Grid.Column="2" />
-                            <Image Name="PART_CenterSelector" Source="avares://Dock.Avalonia.Themes.Default/Assets/DockDocumentInside.png" Height="40" Width="40" Grid.Row="1" Grid.Column="1" />
+                            <Image Name="PART_TopSelector" Source="/Assets/DockAnchorableTop.png" Height="40" Width="40" Grid.Column="1" />
+                            <Image Name="PART_BottomSelector" Source="/Assets/DockAnchorableBottom.png" Height="40" Width="40" Grid.Row="2" Grid.Column="1" />
+                            <Image Name="PART_LeftSelector" Source="/Assets/DockAnchorableLeft.png" Height="40" Width="40" Grid.Row="1" />
+                            <Image Name="PART_RightSelector" Source="/Assets/DockAnchorableRight.png" Height="40" Width="40" Grid.Row="1" Grid.Column="2" />
+                            <Image Name="PART_CenterSelector" Source="/Assets/DockDocumentInside.png" Height="40" Width="40" Grid.Row="1" Grid.Column="1" />
                         </Grid>
                     </Grid>
                 </Grid>

diff --git a/src/Dock.Avalonia.Themes.Default/DockToolChrome.xaml b/src/Dock.Avalonia.Themes.Default/DockToolChrome.xaml
@@ -19,7 +19,7 @@
                     <Border Name="PART_Border" BorderBrush="{DynamicResource ThemeBorderLowBrush}">
                         <Grid Name="PART_Grip">
                             <DockPanel LastChildFill="True" Margin="8 0">
-                                <TextBlock DockPanel.Dock="Left" Text="{Binding ActiveDockable.Title}" HorizontalAlignment="Left" TextAlignment="Center" VerticalAlignment="Center" Height="25"  Margin="0 8 8 0" Background="{Binding #Part_Grip.Background}" />
+                                <TextBlock DockPanel.Dock="Left" Text="{Binding ActiveDockable.Title}" HorizontalAlignment="Left" TextAlignment="Left" VerticalAlignment="Center" Height="25"  Margin="0 8 8 0" Background="{Binding #Part_Grip.Background}" />
                                 <Button Classes="chromeButton" DockPanel.Dock="Right" Name="PART_CloseButton" Command="{Binding Owner.Factory.CloseDockable}" CommandParameter="{Binding ActiveDockable}">
                                     <Image Source="avares://Dock.Avalonia.Themes.Default/Assets/PinClose_Dark.png" Height="13" Width="13" Stretch="None" />
                                 </Button>

diff --git a/src/Dock.Avalonia/Controls/DockToolChrome.cs b/src/Dock.Avalonia/Controls/DockToolChrome.cs
@@ -5,6 +5,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Dock.Model;
@@ -17,23 +18,26 @@ namespace Dock.Avalonia.Controls
     /// </summary>
     public class DockToolChrome : ContentControl
     {
-        static DockToolChrome()
-        {
-            PseudoClass<DockToolChrome>(IsActiveProperty, ":active");
-        }
-
         /// <summary>
         /// Define <see cref="Title"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<string> TitleProprty =
+        public static readonly StyledProperty<string> TitleProprty =
             AvaloniaProperty.Register<DockToolChrome, string>(nameof(Title));
 
         /// <summary>
         /// Define the <see cref="IsActive"/> property.
         /// </summary>
-        public static readonly AvaloniaProperty<bool> IsActiveProperty =
+        public static readonly StyledProperty<bool> IsActiveProperty =
             AvaloniaProperty.Register<DockToolChrome, bool>(nameof(IsActive));
 
+        /// <summary>
+        /// Initialize the new instance of the <see cref="DockToolChrome"/>.
+        /// </summary>
+        public DockToolChrome()
+        {
+            UpdatePseudoClasses(IsActive);
+        }
+
         /// <summary>
         /// Gets or sets chrome tool title.
         /// </summary>
@@ -56,20 +60,17 @@ public bool IsActive
 
         internal Button? CloseButton { get; private set; }
 
-        private IDisposable? _disposable;
-
         /// <inheritdoc/>
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
-            _disposable = AddHandler(InputElement.PointerPressedEvent, Pressed, RoutingStrategies.Tunnel);
+            AddHandler(InputElement.PointerPressedEvent, Pressed, RoutingStrategies.Tunnel);
         }
 
         /// <inheritdoc/>
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnDetachedFromVisualTree(e);
-            _disposable?.Dispose();
         }
 
         private void Pressed(object sender, PointerPressedEventArgs e)
@@ -102,5 +103,25 @@ protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
                 this.PseudoClasses.Set(":floating", true);
             }
         }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged<T>(
+            AvaloniaProperty<T> property,
+            Optional<T> oldValue,
+            BindingValue<T> newValue,
+            BindingPriority priority)
+        {
+            base.OnPropertyChanged(property, oldValue, newValue, priority);
+
+            if (property == IsActiveProperty)
+            {
+                UpdatePseudoClasses(newValue.GetValueOrDefault<bool>());
+            }
+        }
+
+        private void UpdatePseudoClasses(bool isActive)
+        {
+            PseudoClasses.Set(":active", isActive);
+        }
     }
 }
diff --git a/src/Dock.Avalonia/Controls/DocumentControl.cs b/src/Dock.Avalonia/Controls/DocumentControl.cs
@@ -16,20 +16,17 @@ namespace Dock.Avalonia.Controls
     /// </summary>
     public class DocumentControl : TemplatedControl
     {
-        private IDisposable? _disposable;
-
         /// <inheritdoc/>
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
-            _disposable = AddHandler(InputElement.PointerPressedEvent, Pressed, RoutingStrategies.Tunnel);
+            AddHandler(InputElement.PointerPressedEvent, Pressed, RoutingStrategies.Tunnel);
         }
 
         /// <inheritdoc/>
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnDetachedFromVisualTree(e);
-            _disposable?.Dispose();
         }
 
         private void Pressed(object sender, PointerPressedEventArgs e)