Move tool wip

PixiEditor · Dec 4, 2021 · 8e5fbb6 · 8e5fbb6
1 parent c84716d
commit 8e5fbb6
Show file tree

Hide file tree

Showing 8 changed files with 170 additions and 121 deletions.
diff --git a/PixiEditor/Models/Controllers/ClipboardController.cs b/PixiEditor/Models/Controllers/ClipboardController.cs
@@ -34,7 +34,7 @@ public static class ClipboardController
         public static void CopyToClipboard(Layer[] layers, Coordinates[] selection, int originalImageWidth, int originalImageHeight, SerializableDocument document = null)
         {
             Clipboard.Clear();
-            using Surface surface = BitmapUtils.CombineLayers(originalImageWidth, originalImageHeight, layers);
+            using Surface surface = BitmapUtils.CombineLayers(new Int32Rect(0, 0, originalImageWidth, originalImageHeight), layers);
             DataObject data = new DataObject();
 
             WriteableBitmap combinedBitmaps = surface.ToWriteableBitmap();

diff --git a/PixiEditor/Models/DataHolders/Selection.cs b/PixiEditor/Models/DataHolders/Selection.cs
@@ -57,6 +57,11 @@ public void SetSelection(IEnumerable<Coordinates> selection, SelectionType mode)
             SelectionLayer.SetPixels(BitmapPixelChanges.FromSingleColoredArray(selection, selectionColor));
         }
 
+        public void TranslateSelection(int dX, int dY)
+        {
+            //TODO implement
+        }
+
         public void SetSelection(Int32Rect rect, bool isCirclular, SelectionType mode)
         {
             using SKPaint paint = new()

diff --git a/PixiEditor/Models/ImageManipulation/BitmapUtils.cs b/PixiEditor/Models/ImageManipulation/BitmapUtils.cs
@@ -9,16 +9,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace PixiEditor.Models.ImageManipulation
 {
     public static class BitmapUtils
     {
-        public static Surface CombineLayers(int width, int height, IEnumerable<Layer> layers, LayerStructure structure = null)
+        public static Surface CombineLayers(Int32Rect portion, IEnumerable<Layer> layers,  LayerStructure structure = null)
         {
-            Surface finalSurface = new(width, height);
+            Surface finalSurface = new(portion.Width, portion.Height);
             using SKPaint paint = new();
 
             for (int i = 0; i < layers.Count(); i++)
@@ -34,7 +35,14 @@ public static Surface CombineLayers(int width, int height, IEnumerable<Layer> la
                     throw new InvalidOperationException("Layers must not extend beyond canvas borders");
                 }
 
-                layer.LayerBitmap.SkiaSurface.Draw(finalSurface.SkiaSurface.Canvas, layer.OffsetX, layer.OffsetY, paint);
+                using SKImage snapshot = layer.LayerBitmap.SkiaSurface.Snapshot();
+                int x = portion.X - layer.OffsetX;
+                int y = portion.Y - layer.OffsetY;
+                finalSurface.SkiaSurface.Canvas.DrawImage(
+                    snapshot,
+                    new SKRect(x, y, portion.Width + x, portion.Height + y),
+                    new SKRect(0, 0, portion.Width, portion.Height),
+                    paint);
             }
 
             return finalSurface;

diff --git a/PixiEditor/Models/Layers/LayerHelper.cs b/PixiEditor/Models/Layers/LayerHelper.cs
@@ -69,7 +69,7 @@ public static Layer MergeWith(this Layer thisLayer, Layer otherLayer, string new
             int height = yCloser.Height + offsetY + yOther.Height;
 
             // Merge both layers into a bitmap
-            Surface mergedBitmap = BitmapUtils.CombineLayers((int)documentsSize.X, (int)documentsSize.Y, new Layer[] { thisLayer, otherLayer });
+            Surface mergedBitmap = BitmapUtils.CombineLayers(new Int32Rect(0, 0, (int)documentsSize.X, (int)documentsSize.Y), new Layer[] { thisLayer, otherLayer });
             mergedBitmap = mergedBitmap.Crop(xCloser.OffsetX, yCloser.OffsetY, width, height);
 
             // Create the new layer with the merged bitmap

diff --git a/PixiEditor/Models/Tools/Tool.cs b/PixiEditor/Models/Tools/Tool.cs
@@ -92,10 +92,6 @@ public virtual void OnMouseMove(MouseEventArgs e)
         {
         }
 
-        public virtual void AfterAddedUndo(UndoManager undoManager)
-        {
-        }
-
         public virtual void OnSelected()
         {
         }

diff --git a/PixiEditor/Models/Tools/Tools/MagicWandTool.cs b/PixiEditor/Models/Tools/Tools/MagicWandTool.cs
@@ -11,6 +11,7 @@
 using SkiaSharp;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Windows;
 using System.Windows.Input;
 
 namespace PixiEditor.Models.Tools.Tools
@@ -93,7 +94,10 @@ public void DocumentChanged()
 
         private void ValidateCache(Document document)
         {
-            cachedDocument ??= new Layer("_CombinedLayers", BitmapUtils.CombineLayers(document.Width, document.Height, document.Layers, document.LayerStructure));
+            cachedDocument ??= new Layer("_CombinedLayers", BitmapUtils.CombineLayers(
+                new Int32Rect(0, 0, document.Width, document.Height),
+                document.Layers,
+                document.LayerStructure));
         }
     }
 }