Fixes related to previous rework + text color on start

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/DrawableShapeToolExecutor.cs

@@ -55,6 +55,8 @@ internal abstract class DrawableShapeToolExecutor<T> : SimpleShapeToolExecutor w
     public override bool CanUndo => !UseGlobalUndo && document.TransformHandler.HasUndo;
     public override bool CanRedo => !UseGlobalUndo && document.TransformHandler.HasRedo;
 
+    protected virtual bool ApplyEachSettingsChange => false;
+
     public override ExecutionState Start()
     {
         if (base.Start() == ExecutionState.Error)
@@ -372,9 +374,15 @@ internal abstract class DrawableShapeToolExecutor<T> : SimpleShapeToolExecutor w
 
         if (CanEditShape(layer))
         {
-            internals!.ActionAccumulator.AddFinishedActions(EndDrawAction(), SettingsChangedAction(name, value),
-                EndDrawAction());
-            // TODO add to undo
+            if (ApplyEachSettingsChange)
+            {
+                internals!.ActionAccumulator.AddFinishedActions(EndDrawAction(), SettingsChangedAction(name, value),
+                    EndDrawAction());
+            }
+            else
+            {
+                internals!.ActionAccumulator.AddActions(SettingsChangedAction(name, value));
+            }
         }
     }
 

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/VectorEllipseToolExecutor.cs

@@ -29,6 +29,7 @@ internal class VectorEllipseToolExecutor : DrawableShapeToolExecutor<IVectorElli
     protected override bool AlignToPixels => false;
     protected override bool DeleteLayerOnNoDraw => true;
     protected override bool SelectLayerOnTap => true;
+    protected override bool ApplyEachSettingsChange => true;
 
     protected override Predicate<ILayerHandler> CanSelectLayer => x => x is IVectorLayerHandler vec
                                                                        && vec.GetShapeData(vec.Document.AnimationHandler

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/VectorRectangleToolExecutor.cs

@@ -30,6 +30,7 @@ internal class VectorRectangleToolExecutor : DrawableShapeToolExecutor<IVectorRe
 
     protected override bool DeleteLayerOnNoDraw => true;
     protected override bool SelectLayerOnTap => true;
+    protected override bool ApplyEachSettingsChange => true;
 
     protected override Predicate<ILayerHandler> CanSelectLayer => x => x is IVectorLayerHandler vec
                                                                        && vec.GetShapeData(vec.Document.AnimationHandler
@@ -82,7 +83,8 @@ internal class VectorRectangleToolExecutor : DrawableShapeToolExecutor<IVectorRe
 
         lastRect = rect;
 
-        internals!.ActionAccumulator.AddActions(new SetShapeGeometry_Action(memberId, data, VectorShapeChangeType.GeometryData));
+        internals!.ActionAccumulator.AddActions(new SetShapeGeometry_Action(memberId, data,
+            VectorShapeChangeType.GeometryData));
     }
 
     protected override IAction SettingsChangedAction(string name, object value)

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/VectorTextToolExecutor.cs

@@ -33,7 +33,7 @@ internal class VectorTextToolExecutor : UpdateableChangeExecutor, ITextOverlayEv
     private Font? cachedFont;
     private bool isListeningForValidLayer;
     private VectorPath? onPath;
-    
+
     private List<Font> fontsToDispose = new();
 
     public override bool BlocksOtherActions => false;
@@ -62,8 +62,16 @@ internal class VectorTextToolExecutor : UpdateableChangeExecutor, ITextOverlayEv
             return ExecutionState.Success;
         }
 
+        IColorsHandler colorsVM = GetHandler<IColorsHandler>();
+
         isListeningForValidLayer = false;
         var shape = layerHandler.GetShapeData(document.AnimationHandler.ActiveFrameBindable);
+
+        if (toolbar.SyncWithPrimaryColor)
+        {
+            toolbar.FillBrush = new SolidColorBrush(colorsVM.PrimaryColor.ToColor());
+        }
+
         if (shape is TextVectorData textData)
         {
             document.TextOverlayHandler.Show(textData.Text, textData.Position, textData.Font,
@@ -130,6 +138,7 @@ internal class VectorTextToolExecutor : UpdateableChangeExecutor, ITextOverlayEv
                     document.TextOverlayHandler.Show(lastText, position, toolbar.ConstructFont(), lastMatrix,
                         toolbar.Spacing);
                 }
+
                 document.TextOverlayHandler.SetCursorPosition(args.PositionOnCanvas);
             }, false);
     }
@@ -143,7 +152,7 @@ internal class VectorTextToolExecutor : UpdateableChangeExecutor, ITextOverlayEv
     {
         internals.ActionAccumulator.AddFinishedActions(new EndSetShapeGeometry_Action());
         document.TextOverlayHandler.Hide();
-        
+
         foreach (var font in fontsToDispose)
         {
             if (font != null && !font.IsDisposed)
@@ -151,7 +160,7 @@ internal class VectorTextToolExecutor : UpdateableChangeExecutor, ITextOverlayEv
                 font.Dispose();
             }
         }
-        
+
         fontsToDispose.Clear();
     }
 
@@ -168,6 +177,8 @@ internal class VectorTextToolExecutor : UpdateableChangeExecutor, ITextOverlayEv
 
     public override void OnSettingsChanged(string name, object value)
     {
+        if (!document.TextOverlayHandler.IsActive) return;
+
         if (isListeningForValidLayer)
         {
             return;
@@ -186,13 +197,18 @@ internal class VectorTextToolExecutor : UpdateableChangeExecutor, ITextOverlayEv
                 cachedFont = toolbar.ConstructFont();
             }
 
-            document.TextOverlayHandler.Font.Size = toolbar.FontSize;
+            if (document.TextOverlayHandler.Font != null)
+            {
+                document.TextOverlayHandler.Font.Size = toolbar.FontSize;
+            }
+
             cachedFont.Size = toolbar.FontSize;
             cachedFont.Bold = toolbar.Bold;
             cachedFont.Italic = toolbar.Italic;
         }
 
-        VectorShapeChangeType changeType = name switch {
+        VectorShapeChangeType changeType = name switch
+        {
             nameof(ITextToolbar.Fill) => VectorShapeChangeType.Fill,
             nameof(ITextToolbar.FillBrush) => VectorShapeChangeType.Fill,
             nameof(ITextToolbar.StrokeBrush) => VectorShapeChangeType.Stroke,
@@ -204,9 +220,32 @@ internal class VectorTextToolExecutor : UpdateableChangeExecutor, ITextOverlayEv
         };
 
         var constructedText = ConstructTextData(lastText);
-        internals.ActionAccumulator.AddActions(
-            new SetShapeGeometry_Action(selectedMember.Id, constructedText, changeType),
-            new SetLowDpiRendering_Action(selectedMember.Id, toolbar.ForceLowDpiRendering));
+        var layer = document.StructureHelper.Find(selectedMember.Id);
+        TextVectorData previousData =
+            (layer as IVectorLayerHandler).GetShapeData(document.AnimationHandler.ActiveFrameTime) as TextVectorData;
+        FontEdging previousEdging = constructedText.Font.Edging;
+        bool previousAntiAlias = constructedText.AntiAlias;
+        bool previousSubpixel = constructedText.Font.SubPixel;
+
+        if (previousData != null)
+        {
+            constructedText.AntiAlias = previousData.AntiAlias;
+            constructedText.Font.Edging = previousData.Font.Edging;
+            constructedText.Font.SubPixel = previousData.Font.SubPixel;
+        }
+
+        bool equals = constructedText.Equals(previousData);
+
+        constructedText.AntiAlias = previousAntiAlias;
+        constructedText.Font.Edging = previousEdging;
+        constructedText.Font.SubPixel = previousSubpixel;
+
+        if (!equals)
+        {
+            internals.ActionAccumulator.AddActions(
+                new SetShapeGeometry_Action(selectedMember.Id, constructedText, changeType),
+                new SetLowDpiRendering_Action(selectedMember.Id, toolbar.ForceLowDpiRendering));
+        }
 
         document.TextOverlayHandler.Font = constructedText.Font;
         document.TextOverlayHandler.Spacing = toolbar.Spacing;