[Breaking Change] New Rendering Property System

Directory.Packages.props

@@ -33,6 +33,7 @@
     <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.0.1" />
     <PackageVersion Include="ILGPU" Version="1.5.2" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
     <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.3" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.3" />

src/Beutl.Api/Beutl.Api.csproj

@@ -13,7 +13,7 @@
     <PackageReference Include="System.Reactive" />
     <PackageReference Include="System.Interactive" />
     <PackageReference Include="System.Interactive.Async" />
-    
+
     <PackageReference Include="NuGet.ProjectModel" />
     <PackageReference Include="NuGet.Protocol" />
     <PackageReference Include="NuGet.Resolver" />

src/Beutl.Controls/AvaloniaTypeConverter.cs

@@ -99,79 +99,4 @@ public static RelativePoint ToAvaRelativePoint(this in Graphics.RelativePoint pt
                 ? RelativeUnit.Relative
                 : RelativeUnit.Absolute);
     }
-
-    public static Avalonia.Media.IBrush ToAvaBrush(this Media.IBrush brush)
-    {
-        switch (brush)
-        {
-            case Media.ISolidColorBrush s:
-                return new Avalonia.Media.SolidColorBrush
-                {
-                    Color = s.Color.ToAvaColor(),
-                    Opacity = s.Opacity
-                };
-            case Media.IGradientBrush g:
-                {
-                    var sp = g.SpreadMethod switch
-                    {
-                        Media.GradientSpreadMethod.Pad => Avalonia.Media.GradientSpreadMethod.Pad,
-                        Media.GradientSpreadMethod.Reflect => Avalonia.Media.GradientSpreadMethod.Reflect,
-                        Media.GradientSpreadMethod.Repeat => Avalonia.Media.GradientSpreadMethod.Repeat,
-                        _ => throw new ArgumentOutOfRangeException(nameof(brush)),
-                    };
-                    var stops = new Avalonia.Media.GradientStops();
-                    stops.AddRange(g.GradientStops.Select(v => new Avalonia.Media.GradientStop(v.Color.ToAvaColor(), v.Offset)));
-
-                    switch (g)
-                    {
-                        case Media.ILinearGradientBrush l:
-                            {
-                                var st = l.StartPoint;
-                                var ed = l.EndPoint;
-                                return new Avalonia.Media.LinearGradientBrush
-                                {
-                                    StartPoint = st.ToAvaRelativePoint(),
-                                    EndPoint = ed.ToAvaRelativePoint(),
-                                    GradientStops = stops,
-                                    Opacity = l.Opacity,
-                                    SpreadMethod = sp
-                                };
-                            }
-
-                        case Media.IConicGradientBrush c:
-                            {
-                                var center = c.Center;
-                                return new Avalonia.Media.ConicGradientBrush
-                                {
-                                    Center = center.ToAvaRelativePoint(),
-                                    Angle = c.Angle,
-                                    GradientStops = stops,
-                                    Opacity = c.Opacity,
-                                    SpreadMethod = sp
-                                };
-                            }
-
-                        case Media.IRadialGradientBrush r:
-                            {
-                                var center = r.Center;
-                                var origin = r.GradientOrigin;
-                                return new Avalonia.Media.RadialGradientBrush
-                                {
-                                    Center = center.ToAvaRelativePoint(),
-                                    GradientOrigin = origin.ToAvaRelativePoint(),
-                                    RadiusX = new RelativeScalar(r.Radius, RelativeUnit.Relative),
-                                    RadiusY = new RelativeScalar(r.Radius, RelativeUnit.Relative),
-                                    GradientStops = stops,
-                                    Opacity = r.Opacity,
-                                    SpreadMethod = sp
-                                };
-
-                            }
-                    }
-                }
-                break;
-        }
-
-        return null;
-    }
 }

src/Beutl.Controls/PropertyEditors/BrushEditorFlyout.cs

@@ -31,8 +31,8 @@ public sealed class BrushEditorFlyout : PickerFlyoutBase
     public static readonly StyledProperty<Brush?> BrushProperty =
         AvaloniaProperty.Register<BrushEditorFlyout, Brush?>(nameof(Brush));
 
-    public static readonly StyledProperty<Media.IBrush?> OriginalBrushProperty =
-        AvaloniaProperty.Register<BrushEditorFlyout, Media.IBrush?>(nameof(OriginalBrush));
+    public static readonly StyledProperty<Media.Brush?> OriginalBrushProperty =
+        AvaloniaProperty.Register<BrushEditorFlyout, Media.Brush?>(nameof(OriginalBrush));
 
     public static readonly StyledProperty<string?> DrawableNameProperty =
         AvaloniaProperty.Register<BrushEditorFlyout, string?>(nameof(DrawableName));
@@ -46,7 +46,7 @@ public Brush? Brush
         set => SetValue(BrushProperty, value);
     }
 
-    public Media.IBrush? OriginalBrush
+    public Media.Brush? OriginalBrush
     {
         get => GetValue(OriginalBrushProperty);
         set => SetValue(OriginalBrushProperty, value);

src/Beutl.Controls/PropertyEditors/BrushEditorFlyoutPresenter.cs

@@ -20,8 +20,8 @@ public class BrushEditorFlyoutPresenter : DraggablePickerFlyoutPresenter
     public static readonly StyledProperty<Brush?> BrushProperty =
         AvaloniaProperty.Register<BrushEditorFlyoutPresenter, Brush?>(nameof(Brush));
 
-    public static readonly StyledProperty<Media.IBrush?> OriginalBrushProperty =
-        AvaloniaProperty.Register<BrushEditorFlyoutPresenter, Media.IBrush?>(nameof(OriginalBrush));
+    public static readonly StyledProperty<Media.Brush?> OriginalBrushProperty =
+        AvaloniaProperty.Register<BrushEditorFlyoutPresenter, Media.Brush?>(nameof(OriginalBrush));
 
     public static readonly StyledProperty<string?> DrawableNameProperty =
         AvaloniaProperty.Register<BrushEditorFlyoutPresenter, string?>(nameof(DrawableName));
@@ -72,7 +72,7 @@ public Brush? Brush
         set => SetValue(BrushProperty, value);
     }
 
-    public Media.IBrush? OriginalBrush
+    public Media.Brush? OriginalBrush
     {
         get => GetValue(OriginalBrushProperty);
         set => SetValue(OriginalBrushProperty, value);

src/Beutl.Core/Collections/CoreList.cs

@@ -76,6 +76,8 @@ public CoreList(params T[] items)
 
     bool IList.IsFixedSize => false;
 
+    bool ICoreList<T>.IsReadOnly => false;
+
     bool IList.IsReadOnly => false;
 
     int ICollection.Count => Inner.Count;

src/Beutl.Core/Collections/ICoreList.cs

@@ -19,6 +19,8 @@ public interface ICoreList : IList
 
 public interface ICoreList<T> : IObservableList<T>, ICoreReadOnlyList<T>, ICoreList
 {
+    new bool IsReadOnly { get; }
+
     new int Count { get; }
 
     new T this[int index] { get; set; }
@@ -47,4 +49,6 @@ public interface ICoreList<T> : IObservableList<T>, ICoreReadOnlyList<T>, ICoreL
     new void RemoveAt(int index);
 
     new void Clear();
+
+    void EnsureCapacity(int capacity);
 }

src/Beutl.Core/CorePropertyMetadata`1.cs

@@ -50,7 +50,7 @@ public JsonSerializerOptions GetSerializerOptions()
         return _serializerOptions;
     }
 
-    private static IValidator<T> ConvertValidator(ValidationAttribute att)
+    internal static IValidator<T> ConvertValidator(ValidationAttribute att)
     {
         switch (att)
         {
@@ -81,6 +81,14 @@ private static IValidator<T> ConvertValidator(ValidationAttribute att)
 
                 goto default;
 
+            case DataTypeAttribute dataTypeAttribute:
+                if (dataTypeAttribute.DataType == DataType.MultilineText)
+                {
+                    // MultilineTextの場合はバリデーションを行わない
+                    return new DataAnnotationValidater<T>(null);
+                }
+                goto default;
+
             default:
                 return new DataAnnotationValidater<T>(att);
         }

src/Beutl.Core/INotifyEdited.cs

@@ -0,0 +1,6 @@
+namespace Beutl;
+
+public interface INotifyEdited
+{
+    event EventHandler? Edited;
+}

src/Beutl.Core/OptionalJsonConverter.cs

@@ -13,6 +13,7 @@ public override bool CanConvert(Type typeToConvert)
         return typeToConvert.IsAssignableTo(typeof(IOptional));
     }
 
+    // TODO: JsonArrayに対応させる
     public override IOptional? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var jsonNode = JsonNode.Parse(ref reader);

src/Beutl.Core/Serialization/JsonSerializationContext.Deserialize.cs

@@ -137,4 +137,25 @@ private static void DeserializeArray(
             return default;
         }
     }
+
+    public object? GetValue(string name, Type type)
+    {
+        // TにはOptional型が入る場合があるので、Jsonプロパティがnullの場合と存在しない場合で分ける
+        if (_json.TryGetPropertyValue(name, out JsonNode? node))
+        {
+            if (node == null)
+            {
+                return null;
+            }
+            else
+            {
+                return Deserialize(node, type, name, ErrorNotifier, this);
+            }
+        }
+        else
+        {
+            // 存在しない場合
+            return default;
+        }
+    }
 }

src/Beutl.Core/Serialization/JsonSerializationContext.Serialize.cs

@@ -144,4 +144,45 @@ public void SetValue<T>(string name, T? value)
             _knownTypes[name] = (typeof(T), actualType);
         }
     }
+
+    public void SetValue(string name, object? value, Type type)
+    {
+        if (value is Unit)
+        {
+            _json.Remove(name);
+            _knownTypes.Remove(name);
+        }
+        else if (value == null)
+        {
+            _json[name] = null;
+            _knownTypes.Remove(name);
+        }
+        else
+        {
+            Type actualType = value.GetType();
+            if (value is ICoreSerializable or IEnumerable or IReference)
+            {
+                _json[name] = Serialize(name, value, actualType, type, ErrorNotifier, this);
+            }
+            else if (value is JsonNode jsonNode)
+            {
+                _json[name] = jsonNode;
+            }
+            else
+            {
+                ISerializationErrorNotifier? captured = LocalSerializationErrorNotifier.Current;
+                try
+                {
+                    LocalSerializationErrorNotifier.Current = new RelaySerializationErrorNotifier(ErrorNotifier, name);
+                    _json[name] = JsonSerializer.SerializeToNode(value, type, JsonHelper.SerializerOptions);
+                }
+                finally
+                {
+                    LocalSerializationErrorNotifier.Current = captured;
+                }
+            }
+
+            _knownTypes[name] = (type, actualType);
+        }
+    }
 }

src/Beutl.Engine.SourceGenerators/Beutl.Engine.SourceGenerators.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
+    <IsPackable>false</IsPackable>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <RootNamespace>Beutl.Engine.SourceGenerators</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+  </ItemGroup>
+</Project>