mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-06 06:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add commands to navigate frames with same tag

Browse Source
This commit is contained in:
Ying Ruei Liang (KK) 2015-12-05 18:10:24 +08:00
parent 6ab858b722
commit 2fa6f1995e
3 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/gui.xml
View File

@ -85,8 +85,8 @@
<key command="GotoFirstFrame" shortcut="Home" />
<key command="GotoPreviousFrame" shortcut="Left" context="Normal" />
<key command="GotoNextFrame" shortcut="Right" context="Normal" />
<key command="GotoPreviousFrame" shortcut="," />
<key command="GotoNextFrame" shortcut="." />
<key command="GotoPreviousFrameWithSameTag" shortcut="," />
<key command="GotoNextFrameWithSameTag" shortcut="." />
<key command="GotoLastFrame" shortcut="End" />
<key command="GotoFrame" shortcut="Alt+G" />
<key command="PlayAnimation" shortcut="Enter" />

53
src/app/commands/cmd_goto_frame.cpp
View File

@ -11,9 +11,11 @@
#include "app/commands/command.h"
#include "app/commands/params.h"
#include "app/loop_tag.h"
#include "app/modules/editors.h"
#include "app/modules/gui.h"
#include "app/ui/editor/editor.h"
#include "doc/frame_tag.h"
#include "doc/sprite.h"
#include "ui/window.h"
@ -22,6 +24,7 @@
namespace app {
using namespace ui;
using namespace doc;
class GotoCommand : public Command {
protected:
@ -88,6 +91,46 @@ protected:
}
};
class GotoNextFrameWithSameTagCommand : public GotoCommand {
public:
GotoNextFrameWithSameTagCommand() : GotoCommand("GotoNextFrameWithSameTag",
"Go to Next Frame with same tag") { }
Command* clone() const override { return new GotoNextFrameWithSameTagCommand(*this); }
protected:
frame_t onGetFrame(Editor* editor) override {
Sprite* sprite = editor->sprite();
frame_t currentFrame = editor->frame();
FrameTag* tag = get_animation_tag(sprite, currentFrame);
frame_t frameToGo = currentFrame + frame_t(1);
if (frameToGo > tag->toFrame())
frameToGo = tag->fromFrame();
return frameToGo;
}
};
class GotoPreviousFrameWithSameTagCommand : public GotoCommand {
public:
GotoPreviousFrameWithSameTagCommand() : GotoCommand("GotoPreviousFrameWithSameTag",
"Go to Previous Frame with same tag") { }
Command* clone() const override { return new GotoPreviousFrameWithSameTagCommand(*this); }
protected:
frame_t onGetFrame(Editor* editor) override {
Sprite* sprite = editor->sprite();
frame_t currentFrame = editor->frame();
FrameTag* tag = get_animation_tag(sprite, currentFrame);
frame_t frameToGo = currentFrame - frame_t(1);
if (frameToGo < tag->fromFrame())
frameToGo = tag->toFrame();
return frameToGo;
}
};
class GotoLastFrameCommand : public GotoCommand {
public:
GotoLastFrameCommand() : GotoCommand("GotoLastFrame",
@ -157,6 +200,16 @@ Command* CommandFactory::createGotoLastFrameCommand()
return new GotoLastFrameCommand;
}
Command* CommandFactory::createGotoNextFrameWithSameTagCommand()
{
return new GotoNextFrameWithSameTagCommand;
}
Command* CommandFactory::createGotoPreviousFrameWithSameTagCommand()
{
return new GotoPreviousFrameWithSameTagCommand;
}
Command* CommandFactory::createGotoFrameCommand()
{
return new GotoFrameCommand;

2
src/app/commands/commands_list.h
View File

@ -45,9 +45,11 @@ FOR_EACH_COMMAND(GotoFirstFrame)
FOR_EACH_COMMAND(GotoFrame)
FOR_EACH_COMMAND(GotoLastFrame)
FOR_EACH_COMMAND(GotoNextFrame)
FOR_EACH_COMMAND(GotoNextFrameWithSameTag)
FOR_EACH_COMMAND(GotoNextLayer)
FOR_EACH_COMMAND(GotoNextTab)
FOR_EACH_COMMAND(GotoPreviousFrame)
FOR_EACH_COMMAND(GotoPreviousFrameWithSameTag)
FOR_EACH_COMMAND(GotoPreviousLayer)
FOR_EACH_COMMAND(GotoPreviousTab)
FOR_EACH_COMMAND(GridSettings)