mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add possibility to use New Layer via Cut/Copy with ranges

Browse Source 
Requested here: https://community.aseprite.org/t/5222
This commit is contained in:
David Capello 2020-04-17 16:13:22 -03:00
parent fb68407e04
commit e56cc15326
1 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/app/commands/cmd_new_layer.cpp
View File

@ -23,12 +23,14 @@
#include "app/i18n/strings.h" #include "app/i18n/strings.h"
#include "app/load_widget.h" #include "app/load_widget.h"
#include "app/modules/gui.h" #include "app/modules/gui.h"
#include "app/restore_visible_layers.h"
#include "app/tx.h" #include "app/tx.h"
#include "app/ui/main_window.h" #include "app/ui/main_window.h"
#include "app/ui/status_bar.h" #include "app/ui/status_bar.h"
#include "app/ui_context.h" #include "app/ui_context.h"
#include "app/util/clipboard.h" #include "app/util/clipboard.h"
#include "app/util/new_image_from_mask.h" #include "app/util/new_image_from_mask.h"
#include "app/util/range_utils.h"
#include "doc/layer.h" #include "doc/layer.h"
#include "doc/primitives.h" #include "doc/primitives.h"
#include "doc/sprite.h" #include "doc/sprite.h"
@ -357,28 +359,54 @@ void NewLayerCommand::onExecute(Context* context)
#endif // ENABLE_UI #endif // ENABLE_UI
// Paste new layer from selection // Paste new layer from selection
else if ((params().viaCut() || params().viaCopy()) else if ((params().viaCut() || params().viaCopy())
&& layer->isImage()
&& document->isMaskVisible()) { && document->isMaskVisible()) {
const doc::Mask* mask = document->mask(); const doc::Mask* mask = document->mask();
ASSERT(mask); ASSERT(mask);
ImageRef image(new_image_from_mask(site, mask, true));
if (image) { RestoreVisibleLayers restore;
Cel* cel = api.addCel(static_cast<LayerImage*>(layer), SelectedLayers layers;
site.frame(), image); SelectedFrames frames;
if (cel) { bool merged;
if (site.range().enabled()) {
merged = true;
layers = site.range().selectedLayers();
frames = site.range().selectedFrames();
restore.showSelectedLayers(site.sprite(), layers);
}
else {
merged = false;
layers.insert(site.layer());
frames.insert(site.frame());
}
for (frame_t frame : frames) {
ImageRef newImage(new_image_from_mask(site, mask, true, merged));
if (!newImage)
continue;
Cel* newCel = api.addCel(static_cast<LayerImage*>(layer),
frame, newImage);
if (newCel) {
gfx::Point pos = mask->bounds().origin(); gfx::Point pos = mask->bounds().origin();
cel->setPosition(pos.x, pos.y); newCel->setPosition(pos.x, pos.y);
} }
if (params().viaCut() && for (Layer* layer : layers) {
site.cel() && site.layer()) { if (!layer->isImage() ||
tx(new cmd::ClearMask(site.cel())); !layer->isEditable()) // Locked layers will not be modified
continue;
if (site.layer()->isTransparent()) { Cel* origCel = layer->cel(site.frame());
// If the cel wasn't deleted by cmd::ClearMask, we trim it. if (origCel &&
cel = site.layer()->cel(site.frame()); params().viaCut()) {
if (cel) tx(new cmd::ClearMask(origCel));
tx(new cmd::TrimCel(cel));
if (layer->isTransparent()) {
// If the cel wasn't deleted by cmd::ClearMask, we trim it.
origCel = layer->cel(frame);
if (origCel)
tx(new cmd::TrimCel(origCel));
}
} }
} }
} }