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

Fix bug adding an extra empty frame after removing all frames and undoing

Browse Source
This commit is contained in:
David Capello 2018-06-11 11:51:11 -03:00
parent 339183c9df
commit 627ef49716
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/cmd/remove_frame.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2016 David Capello
// Copyright (C) 2001-2018 David Capello
//
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
@ -25,6 +25,7 @@ RemoveFrame::RemoveFrame(Sprite* sprite, frame_t frame)
: WithSprite(sprite)
, m_frame(frame)
, m_firstTime(true)
, m_frameRemoved(false)
{
m_frameDuration = sprite->frameDuration(frame);
for (Cel* cel : sprite->cels(m_frame))
@ -43,9 +44,16 @@ void RemoveFrame::onExecute()
else
m_seq.redo();
int oldTotalFrames = sprite->totalFrames();
sprite->removeFrame(m_frame);
sprite->incrementVersion();
// True when the number of total frames changed (e.g. this can be
// false only then we try to delete the last frame and only frame in
// the sprite).
m_frameRemoved = (oldTotalFrames != sprite->totalFrames());
// Notify observers.
DocumentEvent ev(doc);
ev.sprite(sprite);
@ -58,7 +66,8 @@ void RemoveFrame::onUndo()
Sprite* sprite = this->sprite();
Document* doc = sprite->document();
sprite->addFrame(m_frame);
if (m_frameRemoved)
sprite->addFrame(m_frame);
sprite->setFrameDuration(m_frame, m_frameDuration);
sprite->incrementVersion();
m_seq.undo();

3
src/app/cmd/remove_frame.h
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2016 David Capello
// Copyright (C) 2001-2018 David Capello
//
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
@ -34,6 +34,7 @@ namespace cmd {
int m_frameDuration;
CmdSequence m_seq;
bool m_firstTime;
bool m_frameRemoved;
};
} // namespace cmd