PenTool improvements

PixiEditor · Nov 19, 2021 · b4bca30 · b4bca30
1 parent 6ea4a16
commit b4bca30
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/PixiEditor/Models/Controllers/BitmapManager.cs b/PixiEditor/Models/Controllers/BitmapManager.cs
@@ -248,19 +248,32 @@ private void HighlightPixels(Coordinates newPosition)
             {
                 previewLayerSize = ToolSize;
                 halfSize = (int)Math.Floor(ToolSize / 2f);
-                float sizeMod = ToolSize % 2 == 0 ? 0 : 0.5f;
-                AdjustOffset(newPosition, previewLayer);
-                int centerX = newPosition.X - previewLayer.OffsetX;
-                int centerY = newPosition.Y - previewLayer.OffsetY;
-
                 previewLayer.CreateNewBitmap(ToolSize, ToolSize);
-                previewLayer.LayerBitmap.SkiaSurface.Canvas
-                .DrawOval(
-                    centerX,
-                    centerY,
-                    halfSize + sizeMod,
-                    halfSize + sizeMod,
-                    _highlightPaint);
+
+                if (ToolSize != 3)
+                {
+                    float sizeMod = ToolSize % 2 == 0 ? 0 : 0.5f;
+                    if (ToolSize == 1)
+                    {
+                        sizeMod = 1;
+                    }
+
+                    AdjustOffset(newPosition, previewLayer);
+                    int centerX = newPosition.X - previewLayer.OffsetX;
+                    int centerY = newPosition.Y - previewLayer.OffsetY;
+
+                    previewLayer.LayerBitmap.SkiaSurface.Canvas
+                    .DrawOval(
+                        centerX,
+                        centerY,
+                        halfSize + sizeMod,
+                        halfSize + sizeMod,
+                        _highlightPaint);
+                }
+                else
+                {
+                    previewLayer.LayerBitmap.SkiaSurface.Canvas.Clear(_highlightPaint.Color);
+                }
 
                 previewLayer.InvokeLayerBitmapChange();
             }

diff --git a/PixiEditor/Models/Tools/Tools/PenTool.cs b/PixiEditor/Models/Tools/Tools/PenTool.cs
@@ -69,7 +69,7 @@ public override void Use(Layer layer, List<Coordinates> coordinates, SKColor col
             SKBlendMode blendMode = SKBlendMode.Src)
         {
 
-            SKStrokeCap cap = toolSize == 1 ? SKStrokeCap.Square : SKStrokeCap.Round;
+            SKStrokeCap cap = toolSize == 1 || toolSize == 3 ? SKStrokeCap.Square : SKStrokeCap.Round;
             if (!pixelPerfect)
             {
                 lineTool.DrawLine(layer, startingCoords, latestCords, color, toolSize, blendMode, cap);