mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-24 07:43:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix movement of several layer with locked layers, results in a missed image.

Browse Source 
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.
This commit is contained in:
Gaspar Capello 2020-06-10 09:38:13 -03:00 committed by David Capello
parent f9a9e1a0bc
commit 064482b352
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/ui/editor/pixels_movement.cpp
View File

@ -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);

2
src/app/util/range_utils.cpp
View File

@ -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);