From c004fb6bcdeb32d554f7008c8db748b6b8fcdd4c Mon Sep 17 00:00:00 2001 From: David Capello Date: Sun, 6 Jul 2014 22:10:30 -0300 Subject: [PATCH] Set palette when the frame of the current editor changes --- src/app/ui/document_view.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/ui/document_view.cpp b/src/app/ui/document_view.cpp index da94538e5..1c334289e 100644 --- a/src/app/ui/document_view.cpp +++ b/src/app/ui/document_view.cpp @@ -23,6 +23,10 @@ #include "app/ui/document_view.h" #include "app/app.h" +#include "app/document_event.h" +#include "app/modules/editors.h" +#include "app/modules/gui.h" +#include "app/modules/palettes.h" #include "app/ui/editor/editor.h" #include "app/ui/editor/editor_customization_delegate.h" #include "app/ui/editor/editor_view.h" @@ -30,9 +34,6 @@ #include "app/ui/mini_editor.h" #include "app/ui/workspace.h" #include "base/path.h" -#include "app/document_event.h" -#include "app/modules/editors.h" -#include "app/modules/gui.h" #include "raster/layer.h" #include "raster/sprite.h" #include "ui/accelerator.h" @@ -74,6 +75,8 @@ public: void onFrameChanged(Editor* editor) OVERRIDE { App::instance()->getMainWindow()->getMiniEditor()->updateUsingEditor(this); + + set_current_palette(editor->getSprite()->getPalette(editor->getFrame()), true); } void onLayerChanged(Editor* editor) OVERRIDE {