Rename DocumentObserver/Event to DocObserver/Event

This commit is contained in:
David Capello 2018-07-06 21:06:03 -03:00
parent 9449bb3a43
commit 612ad98392
40 changed files with 261 additions and 261 deletions

View File

@ -12,10 +12,10 @@
#include "base/serialization.h"
#include "doc/cel.h"
#include "doc/cel_io.h"
#include "doc/cel_data_io.h"
#include "doc/cel_io.h"
#include "doc/doc_event.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/image_io.h"
#include "doc/layer.h"
#include "doc/subobjects_io.h"
@ -94,21 +94,21 @@ void AddCel::addCel(Layer* layer, Cel* cel)
layer->incrementVersion();
Document* doc = cel->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(layer->sprite());
ev.layer(layer);
ev.cel(cel);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onAddCel, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onAddCel, ev);
}
void AddCel::removeCel(Layer* layer, Cel* cel)
{
Document* doc = cel->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(layer->sprite());
ev.layer(layer);
ev.cel(cel);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onRemoveCel, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onRemoveCel, ev);
static_cast<LayerImage*>(layer)->removeCel(cel);
layer->incrementVersion();

View File

@ -13,7 +13,7 @@
#include "app/cmd/add_cel.h"
#include "app/document.h"
#include "doc/cel.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
#include "doc/layer.h"
#include "doc/primitives.h"
#include "doc/sprite.h"
@ -53,10 +53,10 @@ void AddFrame::onExecute()
}
// Notify observers about the new frame.
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(sprite);
ev.frame(m_newFrame);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onAddFrame, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onAddFrame, ev);
}
void AddFrame::onUndo()
@ -71,10 +71,10 @@ void AddFrame::onUndo()
sprite->incrementVersion();
// Notify observers about the new frame.
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(sprite);
ev.frame(m_newFrame);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onRemoveFrame, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onRemoveFrame, ev);
}
} // namespace cmd

View File

@ -10,8 +10,8 @@
#include "app/cmd/add_frame_tag.h"
#include "doc/doc_event.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/frame_tag.h"
#include "doc/frame_tag_io.h"
#include "doc/sprite.h"
@ -38,10 +38,10 @@ void AddFrameTag::onExecute()
// Notify observers about the new frame.
Document* doc = sprite->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(sprite);
ev.frameTag(frameTag);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onAddFrameTag, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onAddFrameTag, ev);
}
void AddFrameTag::onUndo()
@ -54,10 +54,10 @@ void AddFrameTag::onUndo()
// Notify observers about the new frame.
{
Document* doc = sprite->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(sprite);
ev.frameTag(frameTag);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onRemoveFrameTag, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onRemoveFrameTag, ev);
}
sprite->frameTags().remove(frameTag);
@ -79,10 +79,10 @@ void AddFrameTag::onRedo()
// Notify observers about the new frame.
Document* doc = sprite->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(sprite);
ev.frameTag(frameTag);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onAddFrameTag, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onAddFrameTag, ev);
}
} // namespace cmd

View File

@ -10,8 +10,8 @@
#include "app/cmd/add_layer.h"
#include "doc/doc_event.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/layer.h"
#include "doc/layer_io.h"
#include "doc/subobjects_io.h"
@ -70,25 +70,25 @@ void AddLayer::addLayer(Layer* group, Layer* newLayer, Layer* afterThis)
group->sprite()->incrementVersion();
Document* doc = group->sprite()->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(group->sprite());
ev.layer(newLayer);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onAddLayer, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onAddLayer, ev);
}
void AddLayer::removeLayer(Layer* group, Layer* layer)
{
Document* doc = group->sprite()->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(layer->sprite());
ev.layer(layer);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onBeforeRemoveLayer, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onBeforeRemoveLayer, ev);
static_cast<LayerGroup*>(group)->removeLayer(layer);
group->incrementVersion();
group->sprite()->incrementVersion();
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onAfterRemoveLayer, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onAfterRemoveLayer, ev);
delete layer;
}

View File

@ -10,8 +10,8 @@
#include "app/cmd/move_layer.h"
#include "doc/doc_event.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/layer.h"
#include "doc/sprite.h"
@ -93,10 +93,10 @@ void MoveLayer::onFireNotifications()
{
Layer* layer = m_layer.layer();
doc::Document* doc = layer->sprite()->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(layer->sprite());
ev.layer(layer);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onLayerRestacked, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onLayerRestacked, ev);
}
} // namespace cmd

View File

@ -12,8 +12,8 @@
#include "app/cmd/remove_cel.h"
#include "doc/cels_range.h"
#include "doc/doc_event.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/sprite.h"
namespace app {
@ -55,10 +55,10 @@ void RemoveFrame::onExecute()
m_frameRemoved = (oldTotalFrames != sprite->totalFrames());
// Notify observers.
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(sprite);
ev.frame(m_frame);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onRemoveFrame, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onRemoveFrame, ev);
}
void RemoveFrame::onUndo()
@ -73,10 +73,10 @@ void RemoveFrame::onUndo()
m_seq.undo();
// Notify observers about the new frame.
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(sprite);
ev.frame(m_frame);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onAddFrame, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onAddFrame, ev);
}
} // namespace cmd

View File

@ -12,7 +12,7 @@
#include "app/document.h"
#include "doc/cel.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
namespace app {
namespace cmd {
@ -41,10 +41,10 @@ void SetCelBoundsF::onUndo()
void SetCelBoundsF::onFireNotifications()
{
Cel* cel = this->cel();
DocumentEvent ev(cel->document());
DocEvent ev(cel->document());
ev.sprite(cel->sprite());
ev.cel(cel);
cel->document()->notify_observers<DocumentEvent&>(&DocumentObserver::onCelPositionChanged, ev);
cel->document()->notify_observers<DocEvent&>(&DocObserver::onCelPositionChanged, ev);
}
} // namespace cmd

View File

@ -11,8 +11,8 @@
#include "app/cmd/set_cel_frame.h"
#include "doc/cel.h"
#include "doc/doc_event.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/layer.h"
#include "doc/sprite.h"
@ -46,12 +46,12 @@ void SetCelFrame::onFireNotifications()
{
Cel* cel = this->cel();
doc::Document* doc = cel->sprite()->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(cel->layer()->sprite());
ev.layer(cel->layer());
ev.cel(cel);
ev.frame(cel->frame());
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onCelFrameChanged, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onCelFrameChanged, ev);
}
} // namespace cmd

View File

@ -12,7 +12,7 @@
#include "app/document.h"
#include "doc/cel.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
namespace app {
namespace cmd {
@ -41,10 +41,10 @@ void SetCelOpacity::onUndo()
void SetCelOpacity::onFireNotifications()
{
Cel* cel = this->cel();
DocumentEvent ev(cel->document());
DocEvent ev(cel->document());
ev.sprite(cel->sprite());
ev.cel(cel);
cel->document()->notify_observers<DocumentEvent&>(&DocumentObserver::onCelOpacityChange, ev);
cel->document()->notify_observers<DocEvent&>(&DocObserver::onCelOpacityChange, ev);
}
} // namespace cmd

View File

@ -12,7 +12,7 @@
#include "app/document.h"
#include "doc/cel.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
namespace app {
namespace cmd {
@ -43,10 +43,10 @@ void SetCelPosition::onUndo()
void SetCelPosition::onFireNotifications()
{
Cel* cel = this->cel();
DocumentEvent ev(cel->document());
DocEvent ev(cel->document());
ev.sprite(cel->sprite());
ev.cel(cel);
cel->document()->notify_observers<DocumentEvent&>(&DocumentObserver::onCelPositionChanged, ev);
cel->document()->notify_observers<DocEvent&>(&DocObserver::onCelPositionChanged, ev);
}
} // namespace cmd

View File

@ -11,7 +11,7 @@
#include "app/cmd/set_frame_duration.h"
#include "app/document.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
#include "doc/sprite.h"
namespace app {
@ -41,10 +41,10 @@ void SetFrameDuration::onFireNotifications()
{
Sprite* sprite = this->sprite();
doc::Document* doc = sprite->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(sprite);
ev.frame(m_frame);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onFrameDurationChanged, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onFrameDurationChanged, ev);
}
} // namespace cmd

View File

@ -10,8 +10,8 @@
#include "app/cmd/set_layer_blend_mode.h"
#include "doc/doc_event.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/layer.h"
#include "doc/sprite.h"
@ -41,10 +41,10 @@ void SetLayerBlendMode::onFireNotifications()
{
Layer* layer = this->layer();
doc::Document* doc = layer->sprite()->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(layer->sprite());
ev.layer(layer);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onLayerBlendModeChange, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onLayerBlendModeChange, ev);
}
} // namespace cmd

View File

@ -10,8 +10,8 @@
#include "app/cmd/set_layer_name.h"
#include "doc/doc_event.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/layer.h"
#include "doc/sprite.h"
@ -41,10 +41,10 @@ void SetLayerName::onFireNotifications()
{
Layer* layer = this->layer();
doc::Document* doc = layer->sprite()->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(layer->sprite());
ev.layer(layer);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onLayerNameChange, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onLayerNameChange, ev);
}
} // namespace cmd

View File

@ -10,8 +10,8 @@
#include "app/cmd/set_layer_opacity.h"
#include "doc/doc_event.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/layer.h"
#include "doc/sprite.h"
@ -41,10 +41,10 @@ void SetLayerOpacity::onFireNotifications()
{
Layer* layer = this->layer();
doc::Document* doc = layer->sprite()->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(layer->sprite());
ev.layer(layer);
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onLayerOpacityChange, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onLayerOpacityChange, ev);
}
} // namespace cmd

View File

@ -18,8 +18,8 @@
#include "base/unique_ptr.h"
#include "doc/cel.h"
#include "doc/cels_range.h"
#include "doc/doc_event.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/layer.h"
#include "doc/palette.h"
#include "doc/sprite.h"
@ -152,9 +152,9 @@ void SetPixelFormat::setFormat(PixelFormat format)
->setExtraCel(ExtraCelRef(nullptr));
// Generate notification
DocumentEvent ev(sprite->document());
DocEvent ev(sprite->document());
ev.sprite(sprite);
sprite->document()->notify_observers<DocumentEvent&>(&DocumentObserver::onPixelFormatChanged, ev);
sprite->document()->notify_observers<DocEvent&>(&DocObserver::onPixelFormatChanged, ev);
}
} // namespace cmd

View File

@ -10,9 +10,9 @@
#include "app/cmd/set_pixel_ratio.h"
#include "doc/doc_event.h"
#include "doc/doc_observer.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/document_observer.h"
#include "doc/sprite.h"
namespace app {
@ -44,9 +44,9 @@ void SetPixelRatio::onUndo()
void SetPixelRatio::onFireNotifications()
{
Sprite* sprite = this->sprite();
DocumentEvent ev(sprite->document());
DocEvent ev(sprite->document());
ev.sprite(sprite);
sprite->document()->notify_observers<DocumentEvent&>(&DocumentObserver::onSpritePixelRatioChanged, ev);
sprite->document()->notify_observers<DocEvent&>(&DocObserver::onSpritePixelRatioChanged, ev);
}
} // namespace cmd

View File

@ -10,8 +10,8 @@
#include "app/cmd/set_slice_name.h"
#include "doc/doc_event.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/slice.h"
#include "doc/sprite.h"

View File

@ -11,7 +11,7 @@
#include "app/cmd/set_sprite_size.h"
#include "app/document.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
#include "doc/sprite.h"
namespace app {
@ -45,9 +45,9 @@ void SetSpriteSize::onUndo()
void SetSpriteSize::onFireNotifications()
{
Sprite* sprite = this->sprite();
DocumentEvent ev(sprite->document());
DocEvent ev(sprite->document());
ev.sprite(sprite);
sprite->document()->notify_observers<DocumentEvent&>(&DocumentObserver::onSpriteSizeChanged, ev);
sprite->document()->notify_observers<DocEvent&>(&DocObserver::onSpriteSizeChanged, ev);
}
} // namespace cmd

View File

@ -11,7 +11,7 @@
#include "app/cmd/set_total_frames.h"
#include "app/document.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
#include "doc/sprite.h"
namespace app {
@ -42,10 +42,10 @@ void SetTotalFrames::onFireNotifications()
{
Sprite* sprite = this->sprite();
doc::Document* doc = sprite->document();
DocumentEvent ev(doc);
DocEvent ev(doc);
ev.sprite(sprite);
ev.frame(sprite->totalFrames());
doc->notify_observers<DocumentEvent&>(&DocumentObserver::onTotalFramesChanged, ev);
doc->notify_observers<DocEvent&>(&DocObserver::onTotalFramesChanged, ev);
}
} // namespace cmd

View File

@ -11,7 +11,7 @@
#include "app/cmd/set_transparent_color.h"
#include "app/document.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
#include "doc/sprite.h"
namespace app {
@ -41,9 +41,9 @@ void SetTransparentColor::onUndo()
void SetTransparentColor::onFireNotifications()
{
Sprite* sprite = this->sprite();
DocumentEvent ev(sprite->document());
DocEvent ev(sprite->document());
ev.sprite(sprite);
sprite->document()->notify_observers<DocumentEvent&>(&DocumentObserver::onSpriteTransparentColorChanged, ev);
sprite->document()->notify_observers<DocEvent&>(&DocObserver::onSpriteTransparentColorChanged, ev);
}
} // namespace cmd

View File

@ -26,7 +26,7 @@
#include "base/scoped_value.h"
#include "doc/cel.h"
#include "doc/cels_range.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
#include "doc/image.h"
#include "doc/layer.h"
#include "doc/sprite.h"
@ -43,7 +43,7 @@ static CelPropertiesWindow* g_window = nullptr;
class CelPropertiesWindow : public app::gen::CelProperties
, public doc::ContextObserver
, public doc::DocumentObserver {
, public doc::DocObserver {
public:
CelPropertiesWindow()
: m_timer(250, this)
@ -230,8 +230,8 @@ private:
setCel(nullptr, nullptr);
}
// DocumentObserver impl
void onCelOpacityChange(DocumentEvent& ev) override {
// DocObserver impl
void onCelOpacityChange(DocEvent& ev) override {
if (m_cel == ev.cel())
updateFromCel();
}

View File

@ -24,8 +24,8 @@
#include "app/ui_context.h"
#include "base/bind.h"
#include "base/scoped_value.h"
#include "doc/doc_event.h"
#include "doc/document.h"
#include "doc/document_event.h"
#include "doc/image.h"
#include "doc/layer.h"
#include "doc/sprite.h"
@ -53,7 +53,7 @@ static LayerPropertiesWindow* g_window = nullptr;
class LayerPropertiesWindow : public app::gen::LayerProperties
, public doc::ContextObserver
, public doc::DocumentObserver {
, public doc::DocObserver {
public:
class BlendModeItem : public ListItem {
public:
@ -277,18 +277,18 @@ private:
setLayer(nullptr, nullptr);
}
// DocumentObserver impl
void onLayerNameChange(DocumentEvent& ev) override {
// DocObserver impl
void onLayerNameChange(DocEvent& ev) override {
if (m_layer == ev.layer())
updateFromLayer();
}
void onLayerOpacityChange(DocumentEvent& ev) override {
void onLayerOpacityChange(DocEvent& ev) override {
if (m_layer == ev.layer())
updateFromLayer();
}
void onLayerBlendModeChange(DocumentEvent& ev) override {
void onLayerBlendModeChange(DocEvent& ev) override {
if (m_layer == ev.layer())
updateFromLayer();
}

View File

@ -169,7 +169,7 @@ void NewFrameCommand::onExecute(Context* context)
static_cast<LayerImage*>(writer.layer()), writer.frame(),
static_cast<LayerImage*>(writer.layer()), writer.frame()+1);
// TODO should we use DocumentObserver?
// TODO should we use DocObserver?
if (UIContext::instance() == context) {
if (DocumentView* view = UIContext::instance()->activeView())
view->editor()->setFrame(writer.frame()+1);

View File

@ -11,7 +11,7 @@
#include "base/mutex.h"
#include "base/thread.h"
#include "doc/context_observer.h"
#include "doc/document_observer.h"
#include "doc/doc_observer.h"
#include "doc/documents_observer.h"
#include <vector>
@ -27,7 +27,7 @@ namespace crash {
class BackupObserver : public doc::ContextObserver
, public doc::DocumentsObserver
, public doc::DocumentObserver {
, public doc::DocObserver {
public:
BackupObserver(Session* session, doc::Context* ctx);
~BackupObserver();

View File

@ -24,8 +24,8 @@
#include "base/unique_ptr.h"
#include "doc/cel.h"
#include "doc/context.h"
#include "doc/document_event.h"
#include "doc/document_observer.h"
#include "doc/doc_event.h"
#include "doc/doc_observer.h"
#include "doc/frame_tag.h"
#include "doc/layer.h"
#include "doc/mask.h"
@ -98,62 +98,62 @@ color_t Document::bgColor(Layer* layer) const
void Document::notifyGeneralUpdate()
{
doc::DocumentEvent ev(this);
notify_observers<doc::DocumentEvent&>(&doc::DocumentObserver::onGeneralUpdate, ev);
doc::DocEvent ev(this);
notify_observers<doc::DocEvent&>(&doc::DocObserver::onGeneralUpdate, ev);
}
void Document::notifySpritePixelsModified(Sprite* sprite, const gfx::Region& region, frame_t frame)
{
doc::DocumentEvent ev(this);
doc::DocEvent ev(this);
ev.sprite(sprite);
ev.region(region);
ev.frame(frame);
notify_observers<doc::DocumentEvent&>(&doc::DocumentObserver::onSpritePixelsModified, ev);
notify_observers<doc::DocEvent&>(&doc::DocObserver::onSpritePixelsModified, ev);
}
void Document::notifyExposeSpritePixels(Sprite* sprite, const gfx::Region& region)
{
doc::DocumentEvent ev(this);
doc::DocEvent ev(this);
ev.sprite(sprite);
ev.region(region);
notify_observers<doc::DocumentEvent&>(&doc::DocumentObserver::onExposeSpritePixels, ev);
notify_observers<doc::DocEvent&>(&doc::DocObserver::onExposeSpritePixels, ev);
}
void Document::notifyLayerMergedDown(Layer* srcLayer, Layer* targetLayer)
{
doc::DocumentEvent ev(this);
doc::DocEvent ev(this);
ev.sprite(srcLayer->sprite());
ev.layer(srcLayer);
ev.targetLayer(targetLayer);
notify_observers<doc::DocumentEvent&>(&doc::DocumentObserver::onLayerMergedDown, ev);
notify_observers<doc::DocEvent&>(&doc::DocObserver::onLayerMergedDown, ev);
}
void Document::notifyCelMoved(Layer* fromLayer, frame_t fromFrame, Layer* toLayer, frame_t toFrame)
{
doc::DocumentEvent ev(this);
doc::DocEvent ev(this);
ev.sprite(fromLayer->sprite());
ev.layer(fromLayer);
ev.frame(fromFrame);
ev.targetLayer(toLayer);
ev.targetFrame(toFrame);
notify_observers<doc::DocumentEvent&>(&doc::DocumentObserver::onCelMoved, ev);
notify_observers<doc::DocEvent&>(&doc::DocObserver::onCelMoved, ev);
}
void Document::notifyCelCopied(Layer* fromLayer, frame_t fromFrame, Layer* toLayer, frame_t toFrame)
{
doc::DocumentEvent ev(this);
doc::DocEvent ev(this);
ev.sprite(fromLayer->sprite());
ev.layer(fromLayer);
ev.frame(fromFrame);
ev.targetLayer(toLayer);
ev.targetFrame(toFrame);
notify_observers<doc::DocumentEvent&>(&doc::DocumentObserver::onCelCopied, ev);
notify_observers<doc::DocEvent&>(&doc::DocObserver::onCelCopied, ev);
}
void Document::notifySelectionChanged()
{
doc::DocumentEvent ev(this);
notify_observers<doc::DocumentEvent&>(&doc::DocumentObserver::onSelectionChanged, ev);
doc::DocEvent ev(this);
notify_observers<doc::DocEvent&>(&doc::DocObserver::onSelectionChanged, ev);
}
bool Document::isModified() const

View File

@ -435,7 +435,7 @@ void ColorBar::onActiveSiteChange(const doc::Site& site)
}
}
void ColorBar::onGeneralUpdate(doc::DocumentEvent& ev)
void ColorBar::onGeneralUpdate(doc::DocEvent& ev)
{
// TODO Observe palette changes only
invalidate();

View File

@ -15,7 +15,7 @@
#include "app/ui/palette_view.h"
#include "base/unique_ptr.h"
#include "doc/context_observer.h"
#include "doc/document_observer.h"
#include "doc/doc_observer.h"
#include "doc/documents_observer.h"
#include "doc/pixel_format.h"
#include "doc/sort_palette.h"
@ -45,7 +45,7 @@ namespace app {
class ColorBar : public ui::Box
, public PaletteViewDelegate
, public doc::ContextObserver
, public doc::DocumentObserver
, public doc::DocObserver
, public app::InputChainElement {
static ColorBar* m_instance;
public:
@ -86,8 +86,8 @@ namespace app {
// ContextObserver impl
void onActiveSiteChange(const doc::Site& site) override;
// DocumentObserver impl
void onGeneralUpdate(doc::DocumentEvent& ev) override;
// DocObserver impl
void onGeneralUpdate(doc::DocEvent& ev) override;
// InputChainElement impl
void onNewInputPriority(InputChainElement* element,

View File

@ -35,7 +35,7 @@
#include "app/ui_context.h"
#include "app/util/clipboard.h"
#include "base/fs.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
#include "doc/layer.h"
#include "doc/sprite.h"
#include "fmt/format.h"
@ -361,25 +361,25 @@ bool DocumentView::onProcessMessage(Message* msg)
return Box::onProcessMessage(msg);
}
void DocumentView::onGeneralUpdate(doc::DocumentEvent& ev)
void DocumentView::onGeneralUpdate(doc::DocEvent& ev)
{
if (m_editor->isVisible())
m_editor->updateEditor();
}
void DocumentView::onSpritePixelsModified(doc::DocumentEvent& ev)
void DocumentView::onSpritePixelsModified(doc::DocEvent& ev)
{
if (m_editor->isVisible() &&
m_editor->frame() == ev.frame())
m_editor->drawSpriteClipped(ev.region());
}
void DocumentView::onLayerMergedDown(doc::DocumentEvent& ev)
void DocumentView::onLayerMergedDown(doc::DocEvent& ev)
{
m_editor->setLayer(ev.targetLayer());
}
void DocumentView::onAddLayer(doc::DocumentEvent& ev)
void DocumentView::onAddLayer(doc::DocEvent& ev)
{
if (current_editor == m_editor) {
ASSERT(ev.layer() != NULL);
@ -387,7 +387,7 @@ void DocumentView::onAddLayer(doc::DocumentEvent& ev)
}
}
void DocumentView::onBeforeRemoveLayer(doc::DocumentEvent& ev)
void DocumentView::onBeforeRemoveLayer(doc::DocEvent& ev)
{
Sprite* sprite = ev.sprite();
Layer* layer = ev.layer();
@ -410,7 +410,7 @@ void DocumentView::onBeforeRemoveLayer(doc::DocumentEvent& ev)
}
}
void DocumentView::onAddFrame(doc::DocumentEvent& ev)
void DocumentView::onAddFrame(doc::DocEvent& ev)
{
if (current_editor == m_editor)
m_editor->setFrame(ev.frame());
@ -418,7 +418,7 @@ void DocumentView::onAddFrame(doc::DocumentEvent& ev)
m_editor->setFrame(m_editor->frame()+1);
}
void DocumentView::onRemoveFrame(doc::DocumentEvent& ev)
void DocumentView::onRemoveFrame(doc::DocEvent& ev)
{
// Adjust current frame of all editors that are in a frame more
// advanced that the removed one.
@ -433,24 +433,24 @@ void DocumentView::onRemoveFrame(doc::DocumentEvent& ev)
}
}
void DocumentView::onAddCel(doc::DocumentEvent& ev)
void DocumentView::onAddCel(doc::DocEvent& ev)
{
UIContext::instance()->notifyActiveSiteChanged();
}
void DocumentView::onRemoveCel(doc::DocumentEvent& ev)
void DocumentView::onRemoveCel(doc::DocEvent& ev)
{
UIContext::instance()->notifyActiveSiteChanged();
}
void DocumentView::onTotalFramesChanged(doc::DocumentEvent& ev)
void DocumentView::onTotalFramesChanged(doc::DocEvent& ev)
{
if (m_editor->frame() >= m_editor->sprite()->totalFrames()) {
m_editor->setFrame(m_editor->sprite()->lastFrame());
}
}
void DocumentView::onLayerRestacked(doc::DocumentEvent& ev)
void DocumentView::onLayerRestacked(doc::DocEvent& ev)
{
m_editor->invalidate();
}

View File

@ -11,7 +11,7 @@
#include "app/ui/input_chain_element.h"
#include "app/ui/tabs.h"
#include "app/ui/workspace_view.h"
#include "doc/document_observer.h"
#include "doc/doc_observer.h"
#include "ui/box.h"
namespace doc {
@ -36,7 +36,7 @@ namespace app {
class DocumentView : public ui::Box
, public TabView
, public doc::DocumentObserver
, public doc::DocObserver
, public WorkspaceView
, public app::InputChainElement {
public:
@ -70,18 +70,18 @@ namespace app {
void onTabPopup(Workspace* workspace) override;
InputChainElement* onGetInputChainElement() override { return this; }
// DocumentObserver implementation
void onGeneralUpdate(doc::DocumentEvent& ev) override;
void onSpritePixelsModified(doc::DocumentEvent& ev) override;
void onLayerMergedDown(doc::DocumentEvent& ev) override;
void onAddLayer(doc::DocumentEvent& ev) override;
void onBeforeRemoveLayer(doc::DocumentEvent& ev) override;
void onAddFrame(doc::DocumentEvent& ev) override;
void onRemoveFrame(doc::DocumentEvent& ev) override;
void onAddCel(doc::DocumentEvent& ev) override;
void onRemoveCel(doc::DocumentEvent& ev) override;
void onTotalFramesChanged(doc::DocumentEvent& ev) override;
void onLayerRestacked(doc::DocumentEvent& ev) override;
// DocObserver implementation
void onGeneralUpdate(doc::DocEvent& ev) override;
void onSpritePixelsModified(doc::DocEvent& ev) override;
void onLayerMergedDown(doc::DocEvent& ev) override;
void onAddLayer(doc::DocEvent& ev) override;
void onBeforeRemoveLayer(doc::DocEvent& ev) override;
void onAddFrame(doc::DocEvent& ev) override;
void onRemoveFrame(doc::DocEvent& ev) override;
void onAddCel(doc::DocEvent& ev) override;
void onRemoveCel(doc::DocEvent& ev) override;
void onTotalFramesChanged(doc::DocEvent& ev) override;
void onLayerRestacked(doc::DocEvent& ev) override;
// InputChainElement impl
void onNewInputPriority(InputChainElement* element,

View File

@ -54,7 +54,7 @@
#include "base/unique_ptr.h"
#include "doc/conversion_she.h"
#include "doc/doc.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
#include "doc/mask_boundaries.h"
#include "doc/slice.h"
#include "she/surface.h"
@ -1926,34 +1926,34 @@ void Editor::onShowExtrasChange()
invalidate();
}
void Editor::onExposeSpritePixels(doc::DocumentEvent& ev)
void Editor::onExposeSpritePixels(doc::DocEvent& ev)
{
if (m_state && ev.sprite() == m_sprite)
m_state->onExposeSpritePixels(ev.region());
}
void Editor::onSpritePixelRatioChanged(doc::DocumentEvent& ev)
void Editor::onSpritePixelRatioChanged(doc::DocEvent& ev)
{
m_proj.setPixelRatio(ev.sprite()->pixelRatio());
invalidate();
}
void Editor::onBeforeRemoveLayer(DocumentEvent& ev)
void Editor::onBeforeRemoveLayer(DocEvent& ev)
{
m_showGuidesThisCel = nullptr;
}
void Editor::onRemoveCel(DocumentEvent& ev)
void Editor::onRemoveCel(DocEvent& ev)
{
m_showGuidesThisCel = nullptr;
}
void Editor::onAddFrameTag(DocumentEvent& ev)
void Editor::onAddFrameTag(DocEvent& ev)
{
m_tagFocusBand = -1;
}
void Editor::onRemoveFrameTag(DocumentEvent& ev)
void Editor::onRemoveFrameTag(DocEvent& ev)
{
m_tagFocusBand = -1;
}

View File

@ -19,7 +19,7 @@
#include "app/ui/editor/editor_observers.h"
#include "app/ui/editor/editor_state.h"
#include "app/ui/editor/editor_states_history.h"
#include "doc/document_observer.h"
#include "doc/doc_observer.h"
#include "doc/frame.h"
#include "doc/image_buffer.h"
#include "filters/tiled_mode.h"
@ -65,7 +65,7 @@ namespace app {
};
class Editor : public ui::Widget
, public doc::DocumentObserver
, public doc::DocObserver
, public IColorSource
, public tools::ActiveToolObserver {
public:
@ -280,13 +280,13 @@ namespace app {
void onTiledModeChange();
void onShowExtrasChange();
// DocumentObserver impl
void onExposeSpritePixels(doc::DocumentEvent& ev) override;
void onSpritePixelRatioChanged(doc::DocumentEvent& ev) override;
void onBeforeRemoveLayer(DocumentEvent& ev) override;
void onRemoveCel(DocumentEvent& ev) override;
void onAddFrameTag(DocumentEvent& ev) override;
void onRemoveFrameTag(DocumentEvent& ev) override;
// DocObserver impl
void onExposeSpritePixels(doc::DocEvent& ev) override;
void onSpritePixelRatioChanged(doc::DocEvent& ev) override;
void onBeforeRemoveLayer(DocEvent& ev) override;
void onRemoveCel(DocEvent& ev) override;
void onAddFrameTag(DocEvent& ev) override;
void onRemoveFrameTag(DocEvent& ev) override;
// ActiveToolObserver impl
void onActiveToolChange(tools::Tool* tool) override;

View File

@ -35,7 +35,7 @@
#include "app/util/range_utils.h"
#include "base/bind.h"
#include "base/string.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
#include "doc/image.h"
#include "doc/layer.h"
#include "doc/sprite.h"
@ -802,7 +802,7 @@ void StatusBar::onRemoveDocument(doc::Document* doc)
}
}
void StatusBar::onPixelFormatChanged(DocumentEvent& ev)
void StatusBar::onPixelFormatChanged(DocEvent& ev)
{
// If this is called from the non-UI thread it means that the pixel
// format change was made in the background,

View File

@ -12,7 +12,7 @@
#include "app/tools/active_tool_observer.h"
#include "base/time.h"
#include "doc/context_observer.h"
#include "doc/document_observer.h"
#include "doc/doc_observer.h"
#include "doc/documents_observer.h"
#include "ui/base.h"
#include "ui/box.h"
@ -44,7 +44,7 @@ namespace app {
class StatusBar : public ui::HBox
, public doc::ContextObserver
, public doc::DocumentsObserver
, public doc::DocumentObserver
, public doc::DocObserver
, public tools::ActiveToolObserver {
static StatusBar* m_instance;
public:
@ -75,11 +75,11 @@ namespace app {
// ContextObserver impl
void onActiveSiteChange(const doc::Site& site) override;
// DocumentObservers impl
// DocObservers impl
void onRemoveDocument(doc::Document* doc) override;
// DocumentObserver impl
void onPixelFormatChanged(DocumentEvent& ev) override;
// DocObserver impl
void onPixelFormatChanged(DocEvent& ev) override;
// ActiveToolObserver impl
void onSelectedToolChange(tools::Tool* tool) override;

View File

@ -46,7 +46,7 @@
#include "base/scoped_value.h"
#include "base/unique_ptr.h"
#include "doc/doc.h"
#include "doc/document_event.h"
#include "doc/doc_event.h"
#include "doc/frame_tag.h"
#include "gfx/point.h"
#include "gfx/rect.h"
@ -1652,12 +1652,12 @@ void Timeline::onRemoveDocument(doc::Document* document)
}
}
void Timeline::onGeneralUpdate(DocumentEvent& ev)
void Timeline::onGeneralUpdate(DocEvent& ev)
{
invalidate();
}
void Timeline::onAddLayer(doc::DocumentEvent& ev)
void Timeline::onAddLayer(doc::DocEvent& ev)
{
ASSERT(ev.layer() != NULL);
@ -1669,7 +1669,7 @@ void Timeline::onAddLayer(doc::DocumentEvent& ev)
invalidate();
}
void Timeline::onAfterRemoveLayer(doc::DocumentEvent& ev)
void Timeline::onAfterRemoveLayer(doc::DocEvent& ev)
{
Sprite* sprite = ev.sprite();
Layer* layer = ev.layer();
@ -1697,7 +1697,7 @@ void Timeline::onAfterRemoveLayer(doc::DocumentEvent& ev)
invalidate();
}
void Timeline::onAddFrame(doc::DocumentEvent& ev)
void Timeline::onAddFrame(doc::DocEvent& ev)
{
setFrame(ev.frame(), false);
@ -1706,7 +1706,7 @@ void Timeline::onAddFrame(doc::DocumentEvent& ev)
invalidate();
}
void Timeline::onRemoveFrame(doc::DocumentEvent& ev)
void Timeline::onRemoveFrame(doc::DocEvent& ev)
{
// Adjust current frame of all editors that are in a frame more
// advanced that the removed one.
@ -1729,18 +1729,18 @@ void Timeline::onRemoveFrame(doc::DocumentEvent& ev)
invalidate();
}
void Timeline::onSelectionChanged(doc::DocumentEvent& ev)
void Timeline::onSelectionChanged(doc::DocEvent& ev)
{
if (m_rangeLocks == 0)
clearAndInvalidateRange();
}
void Timeline::onLayerNameChange(doc::DocumentEvent& ev)
void Timeline::onLayerNameChange(doc::DocEvent& ev)
{
invalidate();
}
void Timeline::onAddFrameTag(DocumentEvent& ev)
void Timeline::onAddFrameTag(DocEvent& ev)
{
if (m_tagFocusBand >= 0) {
m_tagFocusBand = -1;
@ -1749,7 +1749,7 @@ void Timeline::onAddFrameTag(DocumentEvent& ev)
}
}
void Timeline::onRemoveFrameTag(DocumentEvent& ev)
void Timeline::onRemoveFrameTag(DocEvent& ev)
{
onAddFrameTag(ev);
}

View File

@ -14,7 +14,7 @@
#include "app/ui/editor/editor_observer.h"
#include "app/ui/input_chain_element.h"
#include "app/ui/timeline/ani_controls.h"
#include "doc/document_observer.h"
#include "doc/doc_observer.h"
#include "doc/documents_observer.h"
#include "doc/frame.h"
#include "doc/selected_frames.h"
@ -56,7 +56,7 @@ namespace app {
, public ui::ScrollableViewDelegate
, public doc::ContextObserver
, public doc::DocumentsObserver
, public doc::DocumentObserver
, public doc::DocObserver
, public app::EditorObserver
, public app::InputChainElement
, public app::FrameTagProvider {
@ -135,16 +135,16 @@ namespace app {
void onResize(ui::ResizeEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;
// DocumentObserver impl.
void onGeneralUpdate(DocumentEvent& ev) override;
void onAddLayer(doc::DocumentEvent& ev) override;
void onAfterRemoveLayer(doc::DocumentEvent& ev) override;
void onAddFrame(doc::DocumentEvent& ev) override;
void onRemoveFrame(doc::DocumentEvent& ev) override;
void onSelectionChanged(doc::DocumentEvent& ev) override;
void onLayerNameChange(doc::DocumentEvent& ev) override;
void onAddFrameTag(DocumentEvent& ev) override;
void onRemoveFrameTag(DocumentEvent& ev) override;
// DocObserver impl.
void onGeneralUpdate(DocEvent& ev) override;
void onAddLayer(doc::DocEvent& ev) override;
void onAfterRemoveLayer(doc::DocEvent& ev) override;
void onAddFrame(doc::DocEvent& ev) override;
void onRemoveFrame(doc::DocEvent& ev) override;
void onSelectionChanged(doc::DocEvent& ev) override;
void onLayerNameChange(doc::DocEvent& ev) override;
void onAddFrameTag(DocEvent& ev) override;
void onRemoveFrameTag(DocEvent& ev) override;
// app::Context slots.
void onAfterCommandExecution(CommandExecutionEvent& ev);

View File

@ -4,8 +4,8 @@
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
#ifndef DOC_DOCUMENT_EVENT_H_INCLUDED
#define DOC_DOCUMENT_EVENT_H_INCLUDED
#ifndef DOC_DOC_EVENT_H_INCLUDED
#define DOC_DOC_EVENT_H_INCLUDED
#pragma once
#include "gfx/region.h"
@ -25,9 +25,9 @@ namespace doc {
using namespace doc;
class DocumentEvent {
class DocEvent {
public:
DocumentEvent(Document* document)
DocEvent(Document* document)
: m_document(document)
, m_sprite(NULL)
, m_layer(NULL)

75
src/doc/doc_observer.h Normal file
View File

@ -0,0 +1,75 @@
// Aseprite Document Library
// Copyright (c) 2001-2017 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
#ifndef DOC_DOC_OBSERVER_H_INCLUDED
#define DOC_DOC_OBSERVER_H_INCLUDED
#pragma once
namespace doc {
class Document;
class DocEvent;
class DocObserver {
public:
virtual ~DocObserver() { }
virtual void onFileNameChanged(Document* doc) { }
// General update. If an observer receives this event, it's because
// anything in the document could be changed.
virtual void onGeneralUpdate(DocEvent& ev) { }
virtual void onPixelFormatChanged(DocEvent& ev) { }
virtual void onAddLayer(DocEvent& ev) { }
virtual void onAddFrame(DocEvent& ev) { }
virtual void onAddCel(DocEvent& ev) { }
virtual void onAddFrameTag(DocEvent& ev) { }
virtual void onBeforeRemoveLayer(DocEvent& ev) { }
virtual void onAfterRemoveLayer(DocEvent& ev) { }
// Called when a frame is removed. It's called after the frame was
// removed, and the sprite's total number of frames is modified.
virtual void onRemoveFrame(DocEvent& ev) { }
virtual void onRemoveFrameTag(DocEvent& ev) { }
virtual void onRemoveCel(DocEvent& ev) { }
virtual void onSpriteSizeChanged(DocEvent& ev) { }
virtual void onSpriteTransparentColorChanged(DocEvent& ev) { }
virtual void onSpritePixelRatioChanged(DocEvent& ev) { }
virtual void onLayerNameChange(DocEvent& ev) { }
virtual void onLayerOpacityChange(DocEvent& ev) { }
virtual void onLayerBlendModeChange(DocEvent& ev) { }
virtual void onLayerRestacked(DocEvent& ev) { }
virtual void onLayerMergedDown(DocEvent& ev) { }
virtual void onCelMoved(DocEvent& ev) { }
virtual void onCelCopied(DocEvent& ev) { }
virtual void onCelFrameChanged(DocEvent& ev) { }
virtual void onCelPositionChanged(DocEvent& ev) { }
virtual void onCelOpacityChange(DocEvent& ev) { }
virtual void onFrameDurationChanged(DocEvent& ev) { }
virtual void onImagePixelsModified(DocEvent& ev) { }
virtual void onSpritePixelsModified(DocEvent& ev) { }
virtual void onExposeSpritePixels(DocEvent& ev) { }
// When the number of total frames available is modified.
virtual void onTotalFramesChanged(DocEvent& ev) { }
// The selection has changed.
virtual void onSelectionChanged(DocEvent& ev) { }
// Called to destroy the observable. (Here you could call "delete this".)
virtual void dispose() { }
};
} // namespace doc
#endif

View File

@ -70,7 +70,7 @@ void Document::setFilename(const std::string& filename)
else
m_filename = filename;
notify_observers(&DocumentObserver::onFileNameChanged, this);
notify_observers(&DocObserver::onFileNameChanged, this);
}
void Document::close()

View File

@ -11,7 +11,7 @@
#include <string>
#include "base/unique_ptr.h"
#include "doc/document_observer.h"
#include "doc/doc_observer.h"
#include "doc/object.h"
#include "doc/sprites.h"
#include "obs/observable.h"
@ -21,7 +21,7 @@ namespace doc {
class Context;
class Document : public Object
, public obs::observable<DocumentObserver> {
, public obs::observable<DocObserver> {
public:
Document();
~Document();

View File

@ -1,75 +0,0 @@
// Aseprite Document Library
// Copyright (c) 2001-2017 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
#ifndef DOC_DOCUMENT_OBSERVER_H_INCLUDED
#define DOC_DOCUMENT_OBSERVER_H_INCLUDED
#pragma once
namespace doc {
class Document;
class DocumentEvent;
class DocumentObserver {
public:
virtual ~DocumentObserver() { }
virtual void onFileNameChanged(Document* doc) { }
// General update. If an observer receives this event, it's because
// anything in the document could be changed.
virtual void onGeneralUpdate(DocumentEvent& ev) { }
virtual void onPixelFormatChanged(DocumentEvent& ev) { }
virtual void onAddLayer(DocumentEvent& ev) { }
virtual void onAddFrame(DocumentEvent& ev) { }
virtual void onAddCel(DocumentEvent& ev) { }
virtual void onAddFrameTag(DocumentEvent& ev) { }
virtual void onBeforeRemoveLayer(DocumentEvent& ev) { }
virtual void onAfterRemoveLayer(DocumentEvent& ev) { }
// Called when a frame is removed. It's called after the frame was
// removed, and the sprite's total number of frames is modified.
virtual void onRemoveFrame(DocumentEvent& ev) { }
virtual void onRemoveFrameTag(DocumentEvent& ev) { }
virtual void onRemoveCel(DocumentEvent& ev) { }
virtual void onSpriteSizeChanged(DocumentEvent& ev) { }
virtual void onSpriteTransparentColorChanged(DocumentEvent& ev) { }
virtual void onSpritePixelRatioChanged(DocumentEvent& ev) { }
virtual void onLayerNameChange(DocumentEvent& ev) { }
virtual void onLayerOpacityChange(DocumentEvent& ev) { }
virtual void onLayerBlendModeChange(DocumentEvent& ev) { }
virtual void onLayerRestacked(DocumentEvent& ev) { }
virtual void onLayerMergedDown(DocumentEvent& ev) { }
virtual void onCelMoved(DocumentEvent& ev) { }
virtual void onCelCopied(DocumentEvent& ev) { }
virtual void onCelFrameChanged(DocumentEvent& ev) { }
virtual void onCelPositionChanged(DocumentEvent& ev) { }
virtual void onCelOpacityChange(DocumentEvent& ev) { }
virtual void onFrameDurationChanged(DocumentEvent& ev) { }
virtual void onImagePixelsModified(DocumentEvent& ev) { }
virtual void onSpritePixelsModified(DocumentEvent& ev) { }
virtual void onExposeSpritePixels(DocumentEvent& ev) { }
// When the number of total frames available is modified.
virtual void onTotalFramesChanged(DocumentEvent& ev) { }
// The selection has changed.
virtual void onSelectionChanged(DocumentEvent& ev) { }
// Called to destroy the observable. (Here you could call "delete this".)
virtual void dispose() { }
};
} // namespace doc
#endif