Fixes

src/PixiEditor/PixiEditor.csproj

@@ -122,15 +122,6 @@
     <ProjectReference Include="..\PixiEditor.Gen\PixiEditor.Gen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="PixiDocks.Avalonia">
-      <HintPath>..\..\..\PixiDocks\src\PixiDocks.Avalonia\bin\Debug\net8.0\PixiDocks.Avalonia.dll</HintPath>
-    </Reference>
-    <Reference Include="PixiDocks.Core">
-      <HintPath>..\..\..\PixiDocks\src\PixiDocks.Core\bin\Debug\net8.0\PixiDocks.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="../../LICENSE">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/PixiEditor/Views/MainView.axaml

@@ -6,8 +6,8 @@
              xmlns:main1="clr-namespace:PixiEditor.Views.Main"
              xmlns:tools="clr-namespace:PixiEditor.Views.Main.Tools"
              xmlns:commandSearch="clr-namespace:PixiEditor.Views.Main.CommandSearch"
-             xmlns:controls="clr-namespace:PixiDocks.Avalonia.Controls;assembly=PixiDocks.Avalonia"
              xmlns:ui="clr-namespace:PixiEditor.Helpers.UI"
+             xmlns:controls="clr-namespace:PixiDocks.Avalonia.Controls;assembly=PixiDocks.Avalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="PixiEditor.Views.MainView"
              x:DataType="viewModels1:ViewModelMain">

src/PixiEditor/Views/Windows/BetaExampleButton.axaml

@@ -3,35 +3,35 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
-             xmlns:visuals="clr-namespace:PixiEditor.AvaloniaUI.Views.Visuals"
-             xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
-             xmlns:windows="clr-namespace:PixiEditor.AvaloniaUI.Views.Windows"
+             xmlns:visuals1="clr-namespace:PixiEditor.Views.Visuals"
+             xmlns:converters1="clr-namespace:PixiEditor.Helpers.Converters"
+             xmlns:windows1="clr-namespace:PixiEditor.Views.Windows"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="PixiEditor.AvaloniaUI.Views.Windows.BetaExampleButton">
+             x:Class="PixiEditor.Views.Windows.BetaExampleButton">
     <StackPanel>
         <Button Margin="0,10,0,0" HorizontalAlignment="Center"
                 Width="100" Height="100"
                 Padding="0"
-                Command="{Binding OpenCommand, RelativeSource={RelativeSource AncestorType=windows:BetaExampleButton}}"
+                Command="{Binding OpenCommand, RelativeSource={RelativeSource AncestorType=windows1:BetaExampleButton}}"
                 x:Name="fileButton">
             <Grid Width="100" Height="100">
-                <visuals:SurfaceControl
-                    Surface="{Binding BetaExampleFile.PreviewImage, RelativeSource={RelativeSource AncestorType=windows:BetaExampleButton}}"
+                <visuals1:SurfaceControl
+                    Surface="{Binding BetaExampleFile.PreviewImage, RelativeSource={RelativeSource AncestorType=windows1:BetaExampleButton}}"
                     Margin="10"
                     Stretch="Uniform"
                     x:Name="image">
                     <ui:RenderOptionsBindable.BitmapInterpolationMode>
                         <MultiBinding
-                            Converter="{converters:WidthToBitmapScalingModeConverter}">
-                            <Binding Path="BetaExampleFile.PreviewImage.Size.X" RelativeSource="{RelativeSource AncestorType=windows:BetaExampleButton}" />
+                            Converter="{converters1:WidthToBitmapScalingModeConverter}">
+                            <Binding Path="BetaExampleFile.PreviewImage.Size.X" RelativeSource="{RelativeSource AncestorType=windows1:BetaExampleButton}" />
                             <Binding ElementName="image" Path="Width" />
                         </MultiBinding>
                     </ui:RenderOptionsBindable.BitmapInterpolationMode>
-                </visuals:SurfaceControl>
+                </visuals1:SurfaceControl>
             </Grid>
         </Button>
 
-        <TextBlock ui:Translator.Key="{Binding DisplayName, RelativeSource={RelativeSource AncestorType=windows:BetaExampleButton}}"
+        <TextBlock ui:Translator.Key="{Binding DisplayName, RelativeSource={RelativeSource AncestorType=windows1:BetaExampleButton}}"
                    Width="110" TextAlignment="Center"
                    TextTrimming="CharacterEllipsis"
                    TextWrapping="Wrap"

src/PixiEditor/Views/Windows/BetaExampleButton.axaml.cs

@@ -1,12 +1,10 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using CommunityToolkit.Mvvm.Input;
-using PixiEditor.AvaloniaUI.Helpers.Extensions;
-using PixiEditor.AvaloniaUI.ViewModels;
-using PixiEditor.AvaloniaUI.ViewModels.SubViewModels;
+using PixiEditor.Helpers.Extensions;
+using PixiEditor.ViewModels;
 
-namespace PixiEditor.AvaloniaUI.Views.Windows;
+namespace PixiEditor.Views.Windows;
 
 public partial class BetaExampleButton : UserControl
 {

src/PixiEditor/Views/Windows/BetaExampleFile.cs

@@ -1,10 +1,10 @@
 using Avalonia.Platform;
-using PixiEditor.AvaloniaUI.Models.IO;
 using PixiEditor.DrawingApi.Core;
 using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Models.IO;
 using PixiEditor.Parser;
 
-namespace PixiEditor.AvaloniaUI.Views.Windows;
+namespace PixiEditor.Views.Windows;
 
 public class BetaExampleFile
 {

src/PixiEditor/Views/Windows/HelloTherePopup.axaml

@@ -16,6 +16,7 @@
                          xmlns:visuals="clr-namespace:PixiEditor.Views.Visuals"
                          xmlns:skiaSharp="clr-namespace:SkiaSharp;assembly=SkiaSharp"
                          xmlns:ui1="clr-namespace:PixiEditor.Helpers.UI"
+                         xmlns:windows="clr-namespace:PixiEditor.Views.Windows"
                          mc:Ignorable="d"
                          Title="Hello there!" Height="662" Width="982" MinHeight="500" MinWidth="500"
                          Loaded="HelloTherePopup_OnLoaded">