Browse Source

Merge pull request #641 from PixiEditor/fix-cp-version

Fix ColorPicker version mismatch
CPK 10 months ago
parent
commit
ec8d17033a

+ 3 - 3
src/ChunkyImageLib/Operations/EllipseOperation.cs

@@ -21,7 +21,7 @@ internal class EllipseOperation : IMirroredDrawOperation
     private VectorPath? outerPath;
     private VectorPath? outerPath;
     private VectorPath? innerPath;
     private VectorPath? innerPath;
     
     
-    private VectorPath ellipseOutline;
+    private VectorPath? ellipseOutline;
     private Point[]? ellipse;
     private Point[]? ellipse;
     private Point[]? ellipseFill;
     private Point[]? ellipseFill;
     private RectI? ellipseFillRect;
     private RectI? ellipseFillRect;
@@ -102,14 +102,14 @@ internal class EllipseOperation : IMirroredDrawOperation
                 {
                 {
                     paint.Color = fillColor;
                     paint.Color = fillColor;
                     paint.Style = PaintStyle.Fill;
                     paint.Style = PaintStyle.Fill;
-                    surf.Canvas.DrawPath(ellipseOutline, paint);
+                    surf.Canvas.DrawPath(ellipseOutline!, paint);
                 }
                 }
                 
                 
                 paint.Color = strokeColor;
                 paint.Color = strokeColor;
                 paint.Style = PaintStyle.Stroke;
                 paint.Style = PaintStyle.Stroke;
                 paint.StrokeWidth = 1f;
                 paint.StrokeWidth = 1f;
                 
                 
-                surf.Canvas.DrawPath(ellipseOutline, paint);
+                surf.Canvas.DrawPath(ellipseOutline!, paint);
 
 
                 surf.Canvas.Restore();
                 surf.Canvas.Restore();
             }
             }

+ 1 - 1
src/PixiEditor.Zoombox/Zoombox.cs

@@ -125,7 +125,7 @@ public partial class Zoombox : ContentControl, INotifyPropertyChanged
         remove => RemoveHandler(ViewportMovedEvent, value);
         remove => RemoveHandler(ViewportMovedEvent, value);
     }
     }
 
 
-    public event Action<double> ScaleChanged;
+    public event Action<double>? ScaleChanged;
 
 
     public VecD CanvasPos => ToScreenSpace(VecD.Zero);
     public VecD CanvasPos => ToScreenSpace(VecD.Zero);
     public double CanvasX => ToScreenSpace(VecD.Zero).X;
     public double CanvasX => ToScreenSpace(VecD.Zero).X;

+ 0 - 1
src/PixiEditor/PixiEditor.csproj

@@ -100,7 +100,6 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2"/>
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2"/>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2"/>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2"/>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
-    <PackageReference Include="PixiEditor.ColorPicker.Models" Version="1.0.5"/>
     <PackageReference Include="PixiEditor.ColorPicker.AvaloniaUI" Version="1.0.6"/>
     <PackageReference Include="PixiEditor.ColorPicker.AvaloniaUI" Version="1.0.6"/>
   </ItemGroup>
   </ItemGroup>