Browse Source

Merge pull request #855 from PixiEditor/fixes/21.03

Fixes/21.03
Krzysztof Krysiński 4 months ago
parent
commit
c0f0a97c4f

+ 1 - 1
src/Drawie

@@ -1 +1 @@
-Subproject commit d749d83f6090e058c9a0d68620316e32d753a977
+Subproject commit ea188f49d32efa4875d5ae292d80759e85af5945

+ 6 - 2
src/PixiEditor.ChangeableDocument/Changes/Drawing/LineBasedPen_UpdateableChange.cs

@@ -152,10 +152,14 @@ internal class LineBasedPen_UpdateableChange : UpdateableChange
         }
     }
 
-    private RadialGradientPaintable? ApplySoftnessGradient(VecD pos)
+    private Paintable? ApplySoftnessGradient(VecD pos)
     {
-        if (hardness >= 1) return null;
         srcPaint.Paintable?.Dispose();
+        if (hardness >= 1)
+        {
+            return new ColorPaintable(color);
+        }
+
         float radius = strokeWidth / 2f;
         radius = MathF.Max(1, radius);
         return new RadialGradientPaintable(pos, radius,

+ 3 - 1
src/PixiEditor/Data/Configs/ToolSetsConfig.json

@@ -125,7 +125,9 @@
           "AntiAliasing": true,
           "ForceLowDpiRendering": false
         }
-      }
+      },
+      "ColorPicker",
+      "Zoom"
     ]
   }
 ]

+ 0 - 1
src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/TransformSelectedExecutor.cs

@@ -453,7 +453,6 @@ internal class TransformSelectedExecutor : UpdateableChangeExecutor, ITransforma
 
         isInProgress = false;
         document.TransformHandler.PassthroughPointerPressed -= OnLeftMouseButtonDown;
-        DuplicateIfRequired();
     }
 
     private void DuplicateIfRequired()

+ 1 - 1
src/PixiEditor/Views/Rendering/Scene.cs

@@ -618,7 +618,7 @@ internal class Scene : Zoombox.Zoombox, ICustomHitTest
 
     public void QueueNextFrame()
     {
-        if (initialized && !updateQueued && compositor != null)
+        if (initialized && !updateQueued && compositor != null && surface is { IsDisposed: false })
         {
             updateQueued = true;
             compositor.RequestCompositionUpdate(update);