From 064482b3529d841373564424fdef5be8ae279171 Mon Sep 17 00:00:00 2001
From: Gaspar Capello <gaspar@igarastudio.com>
Date: Wed, 10 Jun 2020 09:38:13 -0300
Subject: [PATCH] Fix movement of several layer with locked layers, results in
 a missed image.

Before this fix, the selected image in the active layer was missed. The sequence to reproduce this bug:
- The user moves the selected image portion with several selected layers to a new position,
- Then it locks the active layer,
- Finally, it drops the selection (click outside the selected area).
The selected image in the active layer is missed.
---
 src/app/ui/editor/pixels_movement.cpp | 13 +++++++++++--
 src/app/util/range_utils.cpp          |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/app/ui/editor/pixels_movement.cpp b/src/app/ui/editor/pixels_movement.cpp
index 76e4545b1..dc1883436 100644
--- a/src/app/ui/editor/pixels_movement.cpp
+++ b/src/app/ui/editor/pixels_movement.cpp
@@ -585,6 +585,14 @@ void PixelsMovement::stampImage(bool finalStamp)
     cels.push_back(currentCel);
   }
 
+  if (currentCel && currentCel->layer() &&
+      currentCel->layer()->isImage() &&
+      !currentCel->layer()->isEditableHierarchy()) {
+    Transformation initialCelPos(gfx::Rect(m_initialMask0->bounds()));
+    redrawExtraImage(&initialCelPos);
+    stampExtraCelImage();
+  }
+
   for (Cel* target : cels) {
     // We'll re-create the transformation for the other cels
     if (target != currentCel) {
@@ -992,14 +1000,15 @@ CelList PixelsMovement::getEditableCels()
     // TODO This case is used in paste too, where the cel() can be
     //      nullptr (e.g. we paste the clipboard image into an empty
     //      cel).
-    cels.push_back(m_site.cel());
+    if (m_site.layer() && m_site.layer()->isEditableHierarchy())
+      cels.push_back(m_site.cel());
     return cels;
   }
 
   // Current cel (m_site.cel()) can be nullptr when we paste in an
   // empty cel (Ctrl+V) and cut (Ctrl+X) the floating pixels.
   if (m_site.cel() &&
-      m_site.cel()->layer()->isEditable()) {
+      m_site.cel()->layer()->isEditableHierarchy()) {
     auto it = std::find(cels.begin(), cels.end(), m_site.cel());
     if (it != cels.end())
       cels.erase(it);
diff --git a/src/app/util/range_utils.cpp b/src/app/util/range_utils.cpp
index f31c9f02a..693601883 100644
--- a/src/app/util/range_utils.cpp
+++ b/src/app/util/range_utils.cpp
@@ -39,7 +39,7 @@ static CelList get_cels_templ(const Sprite* sprite,
   for (Layer* layer : range.selectedLayers()) {
     if (!layer ||
         !layer->isImage() ||
-        (onlyUnlockedCel && !layer->isEditable()))
+        (onlyUnlockedCel && !layer->isEditableHierarchy()))
       continue;
 
     LayerImage* layerImage = static_cast<LayerImage*>(layer);