mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-09 18:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix direction reset after scrolling the editor while playing an animation with "ping-pong" direction (fix #3903)

Browse Source
This commit is contained in:
Martín Capello 2023-06-28 13:59:31 -03:00 committed by David Capello
parent f7bc918926
commit b0b2fb378e
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/ui/editor/play_state.cpp
View File

@ -97,23 +97,27 @@ void PlayState::onEnterState(Editor* editor)
m_editor->setFrame(frame); m_editor->setFrame(frame);
} }
m_playback = doc::Playback(
m_editor->sprite(),
m_playSubtags ? m_editor->sprite()->tags().getInternalList() : TagsList(),
m_editor->frame(),
m_playOnce ? doc::Playback::PlayOnce :
m_playAll ? doc::Playback::PlayWithoutTagsInLoop :
doc::Playback::PlayInLoop,
m_tag);
m_toScroll = false; m_toScroll = false;
m_nextFrameTime = getNextFrameTime();
m_curFrameTick = base::current_tick();
// Maybe we came from ScrollingState and the timer is already // Maybe we came from ScrollingState and the timer is already
// running. // running. Which also means there was a Playback in course, so
if (!m_playTimer.isRunning()) // don't create a new one (this fixes an issue when the editor
// came back from the ScrollingState while playing a tag
// with ping-pong direction: the direction was reset every time
// the user released the mouse button after scrolling the editor).
if (!m_playTimer.isRunning()) {
m_playback = doc::Playback(
m_editor->sprite(),
m_playSubtags ? m_editor->sprite()->tags().getInternalList() : TagsList(),
m_editor->frame(),
m_playOnce ? doc::Playback::PlayOnce :
m_playAll ? doc::Playback::PlayWithoutTagsInLoop :
doc::Playback::PlayInLoop,
m_tag);
m_nextFrameTime = getNextFrameTime();
m_curFrameTick = base::current_tick();
m_playTimer.start(); m_playTimer.start();
}
} }
EditorState::LeaveAction PlayState::onLeaveState(Editor* editor, EditorState* newState) EditorState::LeaveAction PlayState::onLeaveState(Editor* editor, EditorState* newState)