Add flat proportional dock presentation

Directory.Packages.props

@@ -1,12 +1,13 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <AvaloniaVersion>12.0.0</AvaloniaVersion>
+    <AvaloniaVersion>12.0.5</AvaloniaVersion>
+    <ProDiagnosticsVersion>12.0.4</ProDiagnosticsVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
     <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="ProDiagnostics" Version="$(ProDiagnosticsVersion)" />
     <PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
     <PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
     <PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />

Dock.slnx

@@ -61,6 +61,7 @@
     <Project Path="samples/DockReactivePropertySample/DockReactivePropertySample.csproj" />
     <Project Path="samples/DockReactiveUICanonicalSample/DockReactiveUICanonicalSample.csproj" />
     <Project Path="samples/DockReactiveUIDiSample/DockReactiveUIDiSample.csproj" />
+    <Project Path="samples/DockReactiveUIFlatSample/DockReactiveUIFlatSample.csproj" />
     <Project Path="samples/DockReactiveUIRoutingSample/DockReactiveUIRoutingSample.csproj" />
     <Project Path="samples/DockReactiveUISample/DockReactiveUISample.csproj" />
     <Project Path="samples/DockReactiveUIRiderSample/DockReactiveUIRiderSample.csproj" />
@@ -84,6 +85,7 @@
     <Project Path="src/Dock.Avalonia.Themes.Simple/Dock.Avalonia.Themes.Simple.csproj" />
     <Project Path="src/Dock.Avalonia/Dock.Avalonia.csproj" />
     <Project Path="src/Dock.Controls.DeferredContentControl/Dock.Controls.DeferredContentControl.csproj" />
+    <Project Path="src/Dock.Controls.Flat/Dock.Controls.Flat.csproj" />
     <Project Path="src/Dock.Controls.ProportionalStackPanel/Dock.Controls.ProportionalStackPanel.csproj" />
     <Project Path="src/Dock.Controls.Recycling.Model/Dock.Controls.Recycling.Model.csproj" />
     <Project Path="src/Dock.Controls.Recycling/Dock.Controls.Recycling.csproj" />
@@ -112,6 +114,7 @@
     <Project Path="tests/Dock.Avalonia.HeadlessTests/Dock.Avalonia.HeadlessTests.csproj" />
     <Project Path="tests/Dock.Avalonia.Themes.UnitTests/Dock.Avalonia.Themes.UnitTests.csproj" />
     <Project Path="tests/Dock.Avalonia.UnitTests/Dock.Avalonia.UnitTests.csproj" />
+    <Project Path="tests/Dock.Controls.Flat.UnitTests/Dock.Controls.Flat.UnitTests.csproj" />
     <Project Path="tests/Dock.Controls.Recycling.Model.UnitTests/Dock.Controls.Recycling.Model.UnitTests.csproj" />
     <Project Path="tests/Dock.Controls.Recycling.UnitTests/Dock.Controls.Recycling.UnitTests.csproj" />
     <Project Path="tests/Dock.MarkupExtension.UnitTests/Dock.MarkupExtension.UnitTests.csproj" />

build/Avalonia.Diagnostics.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.Diagnostics" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference Include="ProDiagnostics" Condition="'$(Configuration)' == 'Debug'" />
   </ItemGroup>
 </Project>

samples/DockDeferredContentSample/App.axaml.cs

@@ -1,6 +1,9 @@
 using System;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
+#if DEBUG
+using Avalonia.Diagnostics;
+#endif
 using Avalonia.Markup.Xaml;
 using Dock.Controls.DeferredContentControl;
 using DockDeferredContentSample.ViewModels;

samples/DockDeferredContentSample/DockDeferredContentSample.csproj

@@ -12,6 +12,7 @@
   <Import Project="..\..\build\Avalonia.props" />
   <Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
   <Import Project="..\..\build\Avalonia.Desktop.props" />
+  <Import Project="..\..\build\Avalonia.Diagnostics.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Dock.Controls.DeferredContentControl\Dock.Controls.DeferredContentControl.csproj" />

samples/DockReactiveUIFlatSample/App.axaml

@@ -0,0 +1,83 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:DockReactiveUIFlatSample"
+             xmlns:core="using:Dock.Model.Core"
+             Name="Dock Avalonia Demo"
+             x:CompileBindings="True"
+             x:Class="DockReactiveUIFlatSample.App">
+
+  <Application.DataTemplates>
+    <local:ViewLocator />
+  </Application.DataTemplates>
+
+  <Application.Resources>
+
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+
+        <ResourceInclude Source="avares://Dock.Avalonia.Themes.Fluent/Presets/Ide/Default.axaml" />
+
+        <ResourceDictionary>
+          <ControlRecycling x:Key="ControlRecyclingKey" />
+        </ResourceDictionary>
+
+        <ResourceDictionary>
+          <ResourceDictionary.ThemeDictionaries>
+            <ResourceDictionary x:Key='Default'>
+              <Color x:Key="RegionColor">#FFFAFAFA</Color>
+              <Color x:Key="AcrylicFallbackColor">#E2E2E2</Color>
+            </ResourceDictionary>
+            <ResourceDictionary x:Key='Dark'>
+              <Color x:Key="RegionColor">#FF212121</Color>
+              <Color x:Key="AcrylicFallbackColor">#1F1F1F</Color>
+            </ResourceDictionary>
+          </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+        </ResourceDictionary.MergedDictionaries>
+
+    </ResourceDictionary>
+
+  </Application.Resources>
+
+  <Application.Styles>
+
+    <FluentTheme />
+
+    <DockFluentFlatTheme />
+
+    <Style Selector="DockControl">
+      <Setter Property="(ControlRecyclingDataTemplate.ControlRecycling)" Value="{StaticResource ControlRecyclingKey}" />
+    </Style>
+
+    <Style Selector="DocumentControl">
+      <Setter Property="HeaderTemplate">
+        <DataTemplate DataType="core:IDockable" x:DataType="core:IDockable">
+          <StackPanel Orientation="Horizontal">
+            <PathIcon
+              Data="M5 1C3.89543 1 3 1.89543 3 3V13C3 14.1046 3.89543 15 5 15H11C12.1046 15 13 14.1046 13 13V5.41421C13 5.01639 12.842 4.63486 12.5607 4.35355L9.64645 1.43934C9.36514 1.15804 8.98361 1 8.58579 1H5ZM4 3C4 2.44772 4.44772 2 5 2H8V4.5C8 5.32843 8.67157 6 9.5 6H12V13C12 13.5523 11.5523 14 11 14H5C4.44772 14 4 13.5523 4 13V3ZM11.7929 5H9.5C9.22386 5 9 4.77614 9 4.5V2.20711L11.7929 5Z"
+              Width="16"
+              Height="16"
+              Margin="0" />
+            <TextBlock Text="{CompiledBinding Title}"
+                       VerticalAlignment="Center"
+                       Padding="4,0,0,0" />
+          </StackPanel>
+        </DataTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="ToolControl">
+      <Setter Property="HeaderTemplate">
+        <DataTemplate DataType="core:IDockable" x:DataType="core:IDockable">
+          <TextBlock Text="{CompiledBinding Title}" Padding="2" />
+        </DataTemplate>
+      </Setter>
+    </Style>
+
+    <Style Selector="ToolChromeControl">
+      <Setter Property="Background" Value="Transparent" />
+    </Style>
+
+  </Application.Styles>
+
+</Application>

samples/DockReactiveUIFlatSample/App.axaml.cs

@@ -0,0 +1,89 @@
+using System.Diagnostics.CodeAnalysis;
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+#if DEBUG
+using Avalonia.Diagnostics;
+#endif
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
+using Dock.Avalonia.Diagnostics.Controls;
+using Dock.Avalonia.Diagnostics;
+using Dock.Avalonia.Themes;
+using Dock.Avalonia.Themes.Fluent;
+using DockReactiveUIFlatSample.Services;
+using DockReactiveUIFlatSample.ViewModels;
+using DockReactiveUIFlatSample.Views;
+
+namespace DockReactiveUIFlatSample;
+
+[RequiresUnreferencedCode("Requires unreferenced code for MainWindowViewModel.")]
+[RequiresDynamicCode("Requires unreferenced code for MainWindowViewModel.")]
+public partial class App : Application
+{
+    public static IDockThemeManager? ThemeManager;
+
+    public override void Initialize()
+    {
+        ThemeManager = new DockFluentThemeManager();
+#if DOCK_USE_GENERATED_APP_INITIALIZE_COMPONENT
+        InitializeComponent();
+#else
+        AvaloniaXamlLoader.Load(this);
+#endif
+    }
+
+    public override void OnFrameworkInitializationCompleted()
+    {
+        // DockManager.s_enableSplitToWindow = true;
+
+        var themeService = ThemeManager is null ? null : new DockThemeService(ThemeManager);
+        var mainWindowViewModel = new MainWindowViewModel(themeService);
+
+        switch (ApplicationLifetime)
+        {
+            case IClassicDesktopStyleApplicationLifetime desktopLifetime:
+            {
+                var mainWindow = new MainWindow
+                {
+                    DataContext = mainWindowViewModel
+                };
+#if DEBUG
+                mainWindow.AttachDockDebug(
+                    () => mainWindowViewModel.Layout!, 
+                    new KeyGesture(Key.F11));
+                mainWindow.AttachDockDebugOverlay(new KeyGesture(Key.F9));
+#endif
+                mainWindow.Closing += (_, _) =>
+                {
+                    mainWindowViewModel.CloseLayout();
+                };
+
+                desktopLifetime.MainWindow = mainWindow;
+
+                desktopLifetime.Exit += (_, _) =>
+                {
+                    mainWindowViewModel.CloseLayout();
+                };
+
+                break;
+            }
+            case ISingleViewApplicationLifetime singleViewLifetime:
+            {
+                var mainView = new MainView()
+                {
+                    DataContext = mainWindowViewModel
+                };
+
+                singleViewLifetime.MainView = mainView;
+
+                break;
+            }
+        }
+
+        base.OnFrameworkInitializationCompleted();
+
+#if DEBUG
+        this.AttachDevTools();
+#endif
+    }
+}

samples/DockReactiveUIFlatSample/DockReactiveUIFlatSample.csproj

@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <OutputType>WinExe</OutputType>
+    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
+    <IsPackable>False</IsPackable>
+    <Nullable>enable</Nullable>
+    <AvaloniaNameGeneratorBehavior>InitializeComponent</AvaloniaNameGeneratorBehavior>
+    <DockEnableGeneratedAppInitializeComponent>true</DockEnableGeneratedAppInitializeComponent>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <PublishAot>true</PublishAot>
+  </PropertyGroup>
+
+  <Import Project="..\..\build\ReferenceAssemblies.props" />
+  <Import Project="..\..\build\Avalonia.props" />
+  <Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
+  <Import Project="..\..\build\Avalonia.Desktop.props" />
+  <Import Project="..\..\build\Avalonia.Diagnostics.props" />
+  <Import Project="..\..\build\Avalonia.ReactiveUI.props" />
+
+  <ItemGroup>
+    <PackageReference Include="StaticViewLocator">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Dock.Model.ReactiveUI\Dock.Model.ReactiveUI.csproj" />
+    <ProjectReference Include="..\..\src\Dock.Model\Dock.Model.csproj" />
+    <ProjectReference Include="..\..\src\Dock.Avalonia\Dock.Avalonia.csproj" />
+    <ProjectReference Include="..\..\src\Dock.Avalonia.Diagnostics\Dock.Avalonia.Diagnostics.csproj" />
+    <ProjectReference Include="..\..\src\Dock.Avalonia.Themes.Fluent\Dock.Avalonia.Themes.Fluent.csproj" />
+    <ProjectReference Include="..\..\src\Dock.Serializer.Newtonsoft\Dock.Serializer.Newtonsoft.csproj" />
+  </ItemGroup>
+
+</Project>

samples/DockReactiveUIFlatSample/Models/DemoData.cs

@@ -0,0 +1,6 @@
+
+namespace DockReactiveUIFlatSample.Models;
+
+public class DemoData
+{
+}

samples/DockReactiveUIFlatSample/Models/Documents/DemoDocument.cs

@@ -0,0 +1,6 @@
+
+namespace DockReactiveUIFlatSample.Models.Documents;
+
+public class DemoDocument
+{
+}

samples/DockReactiveUIFlatSample/Models/Tools/Tool1.cs

@@ -0,0 +1,6 @@
+
+namespace DockReactiveUIFlatSample.Models.Tools;
+
+public class Tool1
+{
+}

samples/DockReactiveUIFlatSample/Models/Tools/Tool2.cs

@@ -0,0 +1,6 @@
+
+namespace DockReactiveUIFlatSample.Models.Tools;
+
+public class Tool2
+{
+}

samples/DockReactiveUIFlatSample/Models/Tools/Tool3.cs

@@ -0,0 +1,6 @@
+
+namespace DockReactiveUIFlatSample.Models.Tools;
+
+public class Tool3
+{
+}

samples/DockReactiveUIFlatSample/Models/Tools/Tool4.cs

@@ -0,0 +1,6 @@
+
+namespace DockReactiveUIFlatSample.Models.Tools;
+
+public class Tool4
+{
+}

samples/DockReactiveUIFlatSample/Models/Tools/Tool5.cs

@@ -0,0 +1,6 @@
+
+namespace DockReactiveUIFlatSample.Models.Tools;
+
+public class Tool5
+{
+}

samples/DockReactiveUIFlatSample/Models/Tools/Tool6.cs

@@ -0,0 +1,6 @@
+
+namespace DockReactiveUIFlatSample.Models.Tools;
+
+public class Tool6
+{
+}

samples/DockReactiveUIFlatSample/Models/Tools/Tool7.cs

@@ -0,0 +1,6 @@
+
+namespace DockReactiveUIFlatSample.Models.Tools;
+
+public class Tool7
+{
+}

samples/DockReactiveUIFlatSample/Models/Tools/Tool8.cs

@@ -0,0 +1,6 @@
+
+namespace DockReactiveUIFlatSample.Models.Tools;
+
+public class Tool8
+{
+}

samples/DockReactiveUIFlatSample/Program.cs

@@ -0,0 +1,30 @@
+// Copyright (c) Wiesław Šoltés. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for details.
+using Avalonia;
+using ReactiveUI.Avalonia;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using Dock.Settings;
+
+namespace DockReactiveUIFlatSample;
+
+[RequiresUnreferencedCode("Requires unreferenced code for App.")]
+[RequiresDynamicCode("Requires unreferenced code for App.")]
+internal class Program
+{
+    [STAThread]
+    private static void Main(string[] args)
+    {
+        BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+    }
+
+    public static AppBuilder BuildAvaloniaApp()
+        => AppBuilder.Configure<App>()
+            .UsePlatformDetect()
+            .WithInterFont()
+            .UseReactiveUI()
+            .ShowDockablePreviewOnDrag()
+            .SetDragPreviewOpacity(0.6)
+            // .UseManagedWindows()
+            .LogToTrace();
+}