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

Don't lock the sprite to change the current layer in the current_editor

Browse Source
This commit is contained in:
David Capello 2015-08-21 10:03:04 -03:00
parent d3232c82ff
commit 318f0d20e9
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_goto_layer.cpp
View File

@ -55,23 +55,20 @@ GotoPreviousLayerCommand::GotoPreviousLayerCommand()
bool GotoPreviousLayerCommand::onEnabled(Context* context)
{
return context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
ContextFlags::HasActiveSprite);
return (current_editor != nullptr &&
current_editor->document());
}
void GotoPreviousLayerCommand::onExecute(Context* context)
{
const ContextReader reader(context);
const Sprite* sprite = reader.sprite();
Site site = *reader.site();
Site site = current_editor->getSite();
if (site.layerIndex() > 0)
site.layerIndex(site.layerIndex().previous());
else
site.layerIndex(LayerIndex(sprite->countLayers()-1));
site.layerIndex(LayerIndex(site.sprite()->countLayers()-1));
// Flash the current layer
ASSERT(current_editor != NULL && "Current editor cannot be null when we have a current sprite");
current_editor->setLayer(site.layer());
current_editor->flashCurrentLayer();
@ -97,23 +94,20 @@ GotoNextLayerCommand::GotoNextLayerCommand()
bool GotoNextLayerCommand::onEnabled(Context* context)
{
return context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
ContextFlags::HasActiveSprite);
return (current_editor != nullptr &&
current_editor->document());
}
void GotoNextLayerCommand::onExecute(Context* context)
{
const ContextReader reader(context);
const Sprite* sprite = reader.sprite();
Site site = *reader.site();
Site site = current_editor->getSite();
if (site.layerIndex() < sprite->countLayers()-1)
if (site.layerIndex() < site.sprite()->countLayers()-1)
site.layerIndex(site.layerIndex().next());
else
site.layerIndex(LayerIndex(0));
// Flash the current layer
ASSERT(current_editor != NULL && "Current editor cannot be null when we have a current sprite");
current_editor->setLayer(site.layer());
current_editor->flashCurrentLayer();