mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-06 06:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make "Duplicate Cels" commands behave like the timeline range is enabled even for the case of one cel

Browse Source 
In this way we can use Alt+D to duplicate the active cel, and Alt+M to
link the active cel in the next frame.
This commit is contained in:
David Capello 2019-10-01 12:05:04 -03:00
parent b6fceaf549
commit cefeb9cbc0
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/commands/cmd_new_frame.cpp
View File

@ -110,6 +110,12 @@ void NewFrameCommand::onExecute(Context* context)
case Content::DUPLICATE_CELS:
case Content::DUPLICATE_CELS_LINKED:
case Content::DUPLICATE_CELS_COPIES: {
std::unique_ptr<bool> continuous = nullptr;
switch (m_content) {
case Content::DUPLICATE_CELS_COPIES: continuous.reset(new bool(false)); break;
case Content::DUPLICATE_CELS_LINKED: continuous.reset(new bool(true)); break;
}
const Site* site = writer.site();
if (site->inTimeline() &&
!site->selectedLayers().empty() &&
@ -132,12 +138,6 @@ void NewFrameCommand::onExecute(Context* context)
(site->selectedFrames().lastFrame() -
site->selectedFrames().firstFrame() + 1);
std::unique_ptr<bool> continuous = nullptr;
switch (m_content) {
case Content::DUPLICATE_CELS_COPIES: continuous.reset(new bool(false)); break;
case Content::DUPLICATE_CELS_LINKED: continuous.reset(new bool(true)); break;
}
for (Layer* layer : selLayers) {
if (layer->isImage()) {
for (frame_t srcFrame : site->selectedFrames().reversed()) {
@ -157,15 +157,9 @@ void NewFrameCommand::onExecute(Context* context)
else if (auto layer = static_cast<LayerImage*>(writer.layer())) {
api.copyCel(
layer, writer.frame(),
layer, writer.frame()+1);
layer, writer.frame()+1, continuous.get());
#ifdef ENABLE_UI // TODO the active frame should be part of the Site
// TODO should we use DocObserver?
if (UIContext::instance() == context) {
if (DocView* view = UIContext::instance()->activeView())
view->editor()->setFrame(writer.frame()+1);
}
#endif
context->setActiveFrame(writer.frame()+1);
}
break;
}