[pull] master from BAndysc:master

.gitattributes

@@ -3,6 +3,9 @@
 ###############################################################################
 * text=auto
 
+# Jsons should always be normalized to LF
+*.json text eol=lf
+
 ###############################################################################
 # Set default behavior for command prompt diff.
 #

.gitignore

@@ -50,7 +50,7 @@ artifacts/
 *_i.h
 *.ilk
 *.meta
-*.obj
+#*.obj
 *.pch
 *.pdb
 *.pgc
@@ -261,4 +261,4 @@ __pycache__/
 *.pyc
 
 # dbc
-.DS_Store
+.DS_Store

.gitmodules

@@ -0,0 +1,24 @@
+[submodule "Dock"]
+	path = Dock
+	url = https://github.com/BAndysc/Dock.git
+[submodule "AvaloniaEdit"]
+	path = AvaloniaEdit
+	url = https://github.com/BAndysc/AvaloniaEdit
+[submodule "WoWPacketParser"]
+	path = WoWPacketParser
+	url = https://github.com/BAndysc/WoWPacketParser
+[submodule "Prism.Avalonia"]
+	path = Prism.Avalonia
+	url = https://github.com/BAndysc/Prism.Avalonia
+[submodule "DBCD"]
+	path = DBCD
+	url = https://github.com/BAndysc/DBCD
+[submodule "Modules/nodify"]
+	path = Libraries/nodify
+	url = https://github.com/BAndysc/nodify-avalonia
+[submodule "Modules/automatic-graph-layout"]
+	path = Libraries/automatic-graph-layout
+	url = https://github.com/microsoft/automatic-graph-layout
+[submodule "Libraries/DiffPlex.Avalonia"]
+	path = Libraries/DiffPlex.Avalonia
+	url = https://github.com/BAndysc/DiffPlex.Avalonia.git

AntlrSupport.props

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+
+    </PropertyGroup>
+</Project>

Avalonia.props

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <AvaloniaVersion>11.1.3-cibuild0051668-beta</AvaloniaVersion>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.0-beta1" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0-beta1" />
+        <PackageReference Include="Projektanker.Icons.Avalonia" Version="9.1.1" />
+        <PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.1.1" />
+        <ProjectReference Include="$(MSBuildThisFileDirectory)\Prism.Avalonia\src\Prism.Avalonia\Prism.Avalonia.csproj" />
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Update="**\*.xaml.cs">
+            <DependentUpon>%(Filename)</DependentUpon>
+        </Compile>
+        <AvaloniaResource Include="**\*.xaml">
+            <SubType>Designer</SubType>
+        </AvaloniaResource>
+    </ItemGroup>
+</Project>

AvaloniaStyles.Desktop/AvaloniaStyles.Desktop.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <Configurations>Debug;Release</Configurations>
+        <Platforms>AnyCPU</Platforms>
+        <Nullable>enable</Nullable>
+        <WarningsAsErrors>$(WarningsAsErrors),nullable</WarningsAsErrors>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\AvaloniaStyles\AvaloniaStyles.csproj" />
+    </ItemGroup>
+
+    <Import Project="..\Module.props" />
+    <Import Project="..\Avalonia.props" />
+
+    <ItemGroup>
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
+    </ItemGroup>
+</Project>

AvaloniaStyles.Desktop/Program.cs

@@ -0,0 +1,16 @@
+using Avalonia;
+
+namespace AvaloniaStyles.Desktop;
+
+public class Program
+{
+    static void Main(string[] args) 
+        => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+
+    // App configuration, used by the entry point and previewer
+    static AppBuilder BuildAvaloniaApp()
+        => AppBuilder.Configure<App>()
+            .UsePlatformDetect()
+            .WithInterFont()
+            .LogToTrace();
+}

AvaloniaStyles/App.xaml

@@ -3,6 +3,10 @@
              xmlns:avaloniaStyles="clr-namespace:AvaloniaStyles"
              x:Class="AvaloniaStyles.App">
     <Application.Styles>
-        <avaloniaStyles:SystemTheme Mode="Windows10Dark" />
+        <avaloniaStyles:SystemTheme Mode="LightWindows11" />
     </Application.Styles>
+    <Application.Resources>
+        <ResourceDictionary>
+        </ResourceDictionary>
+    </Application.Resources>
 </Application>

AvaloniaStyles/App.xaml.cs

@@ -16,20 +16,14 @@ public override void OnFrameworkInitializationCompleted()
         {
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
                 desktop.MainWindow = new MainWindow();
+            else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
+            {
+                singleViewPlatform.MainView = new MainView
+                {
+                    DataContext = new DemoDataContext()
+                };
+            }
             base.OnFrameworkInitializationCompleted();
         }
-
-        static void Main(string[] args) 
-            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
-
-        // App configuration, used by the entry point and previewer
-        static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure<App>()
-                .With(new Win32PlatformOptions
-                {
-                    OverlayPopups = true,
-                })
-                .UsePlatformDetect()
-                .LogToTrace();
     }
 }

AvaloniaStyles/AvaloniaStyles.csproj

@@ -1,24 +1,37 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <OutputType>WinExe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
-        <Configurations>Debug;Release;DebugAvalonia</Configurations>
+        <OutputType>Library</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
+        <Nullable>enable</Nullable>
+        <WarningsAsErrors>$(WarningsAsErrors),nullable</WarningsAsErrors>
     </PropertyGroup>
     <PropertyGroup>
-        <OutputPath>..\bin\$(Configuration)\</OutputPath>
+        <SelfContained>true</SelfContained>
     </PropertyGroup>
+
+    <Import Project="..\Module.props" />    
+
+    <Import Project="..\Avalonia.props" />
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.10.0" />
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.0" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.0" />
-        <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0" />
-        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.0" />
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="FuzzySharp" Version="2.0.2" />
     </ItemGroup>
     <ItemGroup>
-      <AvaloniaResource Include="**\*.xaml" />
       <AvaloniaResource Include="Styles\Assets\Lato\*.ttf" />
+      <None Remove="Fonts\Symbols.ttf" />
+      <AvaloniaResource Include="Fonts\Symbols.ttf" />
+      <AvaloniaResource Remove="Styles\BigSur\**" />
+      <AvaloniaResource Remove="Styles\Catalina\**" />
+      <AvaloniaResource Remove="Styles\MacOs\**" />
+    </ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\AvaloniaEdit\src\AvaloniaEdit\AvaloniaEdit.csproj" />
+      <ProjectReference Include="..\Dock\src\Dock.Avalonia\Dock.Avalonia.csproj" />
+      <ProjectReference Include="..\WDE.MVVM\WDE.MVVM.csproj" />
+      <ProjectReference Include="..\WoWDatabaseEditor.Common\WDE.Common\WDE.Common.csproj" />
     </ItemGroup>
 </Project>

AvaloniaStyles/Behaviours/OpenContextMenuOnClickBehavior.cs

@@ -0,0 +1,52 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Xaml.Interactivity;
+
+namespace AvaloniaStyles.Behaviours;
+
+public class OpenContextMenuOnClickBehavior : Behavior<Button>
+{
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        if (AssociatedObject != null)
+            AssociatedObject.Click += AssociatedObject_PointerPressed;
+    }
+
+    private void AssociatedObject_PointerPressed(object? sender, RoutedEventArgs routedEventArgs)
+    {
+        AssociatedObject?.ContextMenu?.Open();
+    }
+
+    protected override void OnDetaching()
+    {
+        if (AssociatedObject != null)
+            AssociatedObject.Click -= AssociatedObject_PointerPressed;
+        base.OnDetaching();
+    }
+}
+
+
+public class OpenContextMenuOnLeftMouseButtonBehavior : Behavior<Control>
+{
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        if (AssociatedObject != null)
+            AssociatedObject.PointerPressed += AssociatedObject_PointerPressed;
+    }
+
+    private void AssociatedObject_PointerPressed(object? sender, PointerPressedEventArgs routedEventArgs)
+    {
+        AssociatedObject?.ContextMenu?.Open();
+        AssociatedObject?.ContextFlyout?.ShowAt(AssociatedObject!);
+    }
+
+    protected override void OnDetaching()
+    {
+        if (AssociatedObject != null)
+            AssociatedObject.PointerPressed -= AssociatedObject_PointerPressed;
+        base.OnDetaching();
+    }
+}

AvaloniaStyles/Controls/AccentSolidColorBrush.cs

@@ -0,0 +1,55 @@
+using Avalonia;
+using Avalonia.Media;
+using Avalonia.Metadata;
+using AvaloniaStyles.Utils;
+using HslColor = AvaloniaStyles.Utils.HslColor;
+
+namespace AvaloniaStyles.Controls;
+
+public class Accent
+{
+     public static readonly StyledProperty<Color> BaseColorProperty =
+        AvaloniaProperty.RegisterAttached<Accent, SolidColorBrush, Color>("BaseColor");
+
+     public static readonly StyledProperty<HslDiff> HueProperty =
+         AvaloniaProperty.RegisterAttached<Accent, SolidColorBrush, HslDiff>("Hue");
+
+     static Accent()
+     {
+         HueProperty.Changed.AddClassHandler<SolidColorBrush>((brush, e) =>
+         {
+             Color baseColor;
+             if (!brush.IsSet(BaseColorProperty))
+             {
+                 baseColor = brush.Color;
+                 SetBaseColor(brush, baseColor);
+             }
+             else
+             {
+                 baseColor = brush.GetValue(BaseColorProperty);
+             }
+             var hsl = HslColor.FromRgba(baseColor).Scale(e.NewValue as HslDiff);
+             brush.Color = hsl.ToRgba();
+         });
+     }
+
+     public static Color GetBaseColor(AvaloniaObject obj)
+     {
+         return obj.GetValue(BaseColorProperty);
+     }
+
+     public static void SetBaseColor(AvaloniaObject obj, Color value)
+     {
+         obj.SetValue(BaseColorProperty, value);
+     }
+
+     public static HslDiff GetHue(AvaloniaObject obj)
+     {
+         return obj.GetValue(HueProperty);
+     }
+
+     public static void SetHue(AvaloniaObject obj, HslDiff value)
+     {
+         obj.SetValue(HueProperty, value);
+     }
+}

AvaloniaStyles/Controls/BalloonPopup.axaml

@@ -0,0 +1,41 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <BalloonPopup Content="Abcdefg" ShowTail="True" />
+  </Design.PreviewWith>
+
+  <Style Selector="BalloonPopup">
+    <Setter Property="ClipToBounds" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel Name="PART_RootPanel">
+          <Border BoxShadow="0 5 10 2 #40000000" Background="{DynamicResource TeachingTipBackground}"
+                  BorderThickness="1"
+                  ClipToBounds="False"
+                  Margin="10,-1,10,10"
+                  CornerRadius="{DynamicResource ControlCornerRadius}"
+                  BorderBrush="{DynamicResource TeachingTipBorderBrush}" Padding="10">
+            <ContentPresenter x:Name="PART_ContentPresenter"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+          </Border>
+          <Path DockPanel.Dock="Top"
+                IsVisible="{TemplateBinding ShowTail}"
+                Fill="{DynamicResource TeachingTipBackground}"
+                HorizontalAlignment="{TemplateBinding TailAlignment}"
+                VerticalAlignment="Top"
+                Stroke="{DynamicResource TeachingTipBorderBrush}"
+                StrokeThickness="1"
+                Data="M0,10 L10,0 L20,10"
+                Margin="20,-10,20,0" />
+          <!-- cover the tail -->
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+  <Style Selector="BalloonPopup:showtail /template/ Panel#PART_RootPanel">
+    <Setter Property="Margin" Value="0,10,0,0"/> <!-- space for the tail -->
+  </Style>
+</Styles>