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

Don't redraw brush preview area in other editors if they aren't in the current frame

Browse Source
This commit is contained in:
David Capello 2015-08-12 17:32:17 -03:00
parent 1b930d4d42
commit b75b9a6f1b
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/document.cpp
View File

@ -114,11 +114,12 @@ void Document::notifyGeneralUpdate()
notifyObservers<doc::DocumentEvent&>(&doc::DocumentObserver::onGeneralUpdate, ev); notifyObservers<doc::DocumentEvent&>(&doc::DocumentObserver::onGeneralUpdate, ev);
} }
void Document::notifySpritePixelsModified(Sprite* sprite, const gfx::Region& region) void Document::notifySpritePixelsModified(Sprite* sprite, const gfx::Region& region, frame_t frame)
{ {
doc::DocumentEvent ev(this); doc::DocumentEvent ev(this);
ev.sprite(sprite); ev.sprite(sprite);
ev.region(region); ev.region(region);
ev.frame(frame);
notifyObservers<doc::DocumentEvent&>(&doc::DocumentObserver::onSpritePixelsModified, ev); notifyObservers<doc::DocumentEvent&>(&doc::DocumentObserver::onSpritePixelsModified, ev);
} }

2
src/app/document.h
View File

@ -79,7 +79,7 @@ namespace app {
// Notifications // Notifications
void notifyGeneralUpdate(); void notifyGeneralUpdate();
void notifySpritePixelsModified(Sprite* sprite, const gfx::Region& region); void notifySpritePixelsModified(Sprite* sprite, const gfx::Region& region, frame_t frame);
void notifyExposeSpritePixels(Sprite* sprite, const gfx::Region& region); void notifyExposeSpritePixels(Sprite* sprite, const gfx::Region& region);
void notifyLayerMergedDown(Layer* srcLayer, Layer* targetLayer); void notifyLayerMergedDown(Layer* srcLayer, Layer* targetLayer);
void notifyCelMoved(Layer* fromLayer, frame_t fromFrame, Layer* toLayer, frame_t toFrame); void notifyCelMoved(Layer* fromLayer, frame_t fromFrame, Layer* toLayer, frame_t toFrame);

3
src/app/ui/document_view.cpp
View File

@ -373,7 +373,8 @@ void DocumentView::onGeneralUpdate(doc::DocumentEvent& ev)
void DocumentView::onSpritePixelsModified(doc::DocumentEvent& ev) void DocumentView::onSpritePixelsModified(doc::DocumentEvent& ev)
{ {
if (m_editor->isVisible()) if (m_editor->isVisible() &&
m_editor->frame() == ev.frame())
m_editor->drawSpriteClipped(ev.region()); m_editor->drawSpriteClipped(ev.region());
} }

10
src/app/ui/editor/brush_preview.cpp
View File

@ -155,7 +155,7 @@ void BrushPreview::show(const gfx::Point& screenPos)
if (cel) opacity = MUL_UN8(opacity, cel->opacity(), t); if (cel) opacity = MUL_UN8(opacity, cel->opacity(), t);
if (layer) opacity = MUL_UN8(opacity, static_cast<LayerImage*>(layer)->opacity(), t); if (layer) opacity = MUL_UN8(opacity, static_cast<LayerImage*>(layer)->opacity(), t);
document->prepareExtraCel(brushBounds, m_editor->frame(), opacity); document->prepareExtraCel(brushBounds, site.frame(), opacity);
document->setExtraCelType(render::ExtraType::NONE); document->setExtraCelType(render::ExtraType::NONE);
document->setExtraCelBlendMode( document->setExtraCelBlendMode(
(layer ? static_cast<LayerImage*>(layer)->blendMode(): (layer ? static_cast<LayerImage*>(layer)->blendMode():
@ -168,7 +168,7 @@ void BrushPreview::show(const gfx::Point& screenPos)
if (layer) { if (layer) {
render::Render().renderLayer( render::Render().renderLayer(
extraImage, layer, m_editor->frame(), extraImage, layer, site.frame(),
gfx::Clip(0, 0, brushBounds), gfx::Clip(0, 0, brushBounds),
BlendMode::SRC); BlendMode::SRC);
@ -192,7 +192,7 @@ void BrushPreview::show(const gfx::Point& screenPos)
} }
document->notifySpritePixelsModified( document->notifySpritePixelsModified(
sprite, gfx::Region(m_lastBounds = brushBounds)); sprite, gfx::Region(m_lastBounds = brushBounds), site.frame());
m_withRealPreview = true; m_withRealPreview = true;
} }
@ -246,9 +246,11 @@ void BrushPreview::hide()
// Clean pixel/brush preview // Clean pixel/brush preview
if (m_withRealPreview) { if (m_withRealPreview) {
frame_t frame = document->getExtraCel()->frame();
document->destroyExtraCel(); document->destroyExtraCel();
document->notifySpritePixelsModified( document->notifySpritePixelsModified(
sprite, gfx::Region(m_lastBounds)); sprite, gfx::Region(m_lastBounds), frame);
m_withRealPreview = false; m_withRealPreview = false;
} }

3
src/app/ui/editor/pixels_movement.cpp
View File

@ -409,7 +409,8 @@ void PixelsMovement::moveImage(const gfx::Point& pos, MoveModifier moveModifier)
// If "fullBounds" is empty is because the cel was not moved // If "fullBounds" is empty is because the cel was not moved
if (!fullBounds.isEmpty()) { if (!fullBounds.isEmpty()) {
// Notify the modified region. // Notify the modified region.
m_document->notifySpritePixelsModified(m_sprite, gfx::Region(fullBounds)); m_document->notifySpritePixelsModified(m_sprite, gfx::Region(fullBounds),
m_site.frame());
} }
} }

3
src/app/ui/editor/tool_loop_impl.cpp
View File

@ -192,7 +192,8 @@ public:
void updateDirtyArea() override { void updateDirtyArea() override {
// TODO find a way to avoid calling hide/show brush preview here // TODO find a way to avoid calling hide/show brush preview here
HideBrushPreview hide(m_editor->brushPreview()); HideBrushPreview hide(m_editor->brushPreview());
m_document->notifySpritePixelsModified(m_sprite, m_dirtyArea); m_document->notifySpritePixelsModified(m_sprite, m_dirtyArea,
m_frame);
} }
void updateStatusBar(const char* text) override { void updateStatusBar(const char* text) override {