mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-01 10:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change current palette after undo/redo

Browse Source
This commit is contained in:
David Capello 2014-06-01 18:10:26 -03:00
parent c56d3d1170
commit 76afcfedac
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/commands/cmd_undo.cpp
View File

@ -27,6 +27,7 @@
#include "app/ini_file.h" #include "app/ini_file.h"
#include "app/modules/editors.h" #include "app/modules/editors.h"
#include "app/modules/gui.h" #include "app/modules/gui.h"
#include "app/modules/palettes.h"
#include "app/ui/editor/editor.h" #include "app/ui/editor/editor.h"
#include "app/ui/status_bar.h" #include "app/ui/status_bar.h"
#include "base/thread.h" #include "base/thread.h"
@ -117,6 +118,7 @@ void UndoCommand::onExecute(Context* context)
document->destroyExtraCel(); // Regenerate extras document->destroyExtraCel(); // Regenerate extras
update_screen_for_document(document); update_screen_for_document(document);
set_current_palette(writer.palette(), false);
} }
Command* CommandFactory::createUndoCommand() Command* CommandFactory::createUndoCommand()

4
src/app/context_access.h
View File

@ -51,6 +51,10 @@ namespace app {
return m_location.image(x, y, opacity); return m_location.image(x, y, opacity);
} }
Palette* palette() const {
return m_location.palette();
}
protected: protected:
ContextAccess(const Context* context) ContextAccess(const Context* context)
: m_context(context) : m_context(context)

5
src/app/document_location.cpp
View File

@ -84,4 +84,9 @@ Image* DocumentLocation::image(int* x, int* y, int* opacity) const
return image; return image;
} }
Palette* DocumentLocation::palette() const
{
return (m_sprite ? m_sprite->getPalette(m_frame): NULL);
}
} // namespace app } // namespace app

1
src/app/document_location.h
View File

@ -67,6 +67,7 @@ namespace app {
void layerIndex(LayerIndex layerIndex); void layerIndex(LayerIndex layerIndex);
Palette* palette(); Palette* palette();
Image* image(int* x = NULL, int* y = NULL, int* opacity = NULL) const; Image* image(int* x = NULL, int* y = NULL, int* opacity = NULL) const;
Palette* palette() const;
private: private:
Document* m_document; Document* m_document;