FIXED MOVE TOOL FINALLY

PixiEditor · Mar 8, 2021 · fa4641d · fa4641d
1 parent bc836ae
commit fa4641d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/PixiEditor/Models/Tools/Tools/MoveTool.cs b/PixiEditor/Models/Tools/Tools/MoveTool.cs
@@ -23,8 +23,8 @@ public class MoveTool : BitmapOperationTool
         private Dictionary<Guid, bool> clearedPixels = new Dictionary<Guid, bool>();
         private Coordinates[] currentSelection;
         private Coordinates lastMouseMove;
-        private Coordinates lastStartMousePos;
         private Dictionary<Guid, Color[]> startPixelColors;
+        private Dictionary<Guid, Color[]> endPixelColors;
         private Dictionary<Guid, Thickness> startingOffsets;
         private Coordinates[] startSelection;
         private bool updateViewModelSelection = true;
@@ -67,12 +67,15 @@ public override void AfterAddedUndo(UndoManager undoManager)
                 foreach (var item in startPixelColors)
                 {
                     BitmapPixelChanges beforeMovePixels = BitmapPixelChanges.FromArrays(startSelection, item.Value);
+                    BitmapPixelChanges afterMovePixels = BitmapPixelChanges.FromArrays(currentSelection, endPixelColors[item.Key]);
                     Guid layerGuid = item.Key;
                     var oldValue = (LayerChange[])changes.OldValue;
 
                     if (oldValue.Any(x => x.LayerGuid == layerGuid))
                     {
-                        oldValue.First(x => x.LayerGuid == layerGuid).PixelChanges.ChangedPixels
+                        var layer = oldValue.First(x => x.LayerGuid == layerGuid);
+                        layer.PixelChanges.ChangedPixels.AddRangeOverride(afterMovePixels.ChangedPixels);
+                        layer.PixelChanges.ChangedPixels
                             .AddRangeOverride(beforeMovePixels.ChangedPixels);
 
                         ((LayerChange[])changes.NewValue).First(x => x.LayerGuid == layerGuid).PixelChanges.ChangedPixels
@@ -138,6 +141,7 @@ public override LayerChange[] Use(Layer layer, Coordinates[] mouseMove, Color co
             {
                 if (currentSelection.Length > 0)
                 {
+                    endPixelColors = BitmapUtils.GetPixelsForSelection(affectedLayers, currentSelection);
                     var changes = MoveSelection(affectedLayers[i], mouseMove);
                     changes = RemoveTransparentPixels(changes);
 
@@ -206,7 +210,6 @@ private BitmapPixelChanges RemoveTransparentPixels(BitmapPixelChanges pixels)
 
         private void ResetSelectionValues(Coordinates start)
         {
-            lastStartMousePos = start;
             lastMouseMove = start;
             clearedPixels = new Dictionary<Guid, bool>();
             updateViewModelSelection = true;