mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add some time to unlock sprite to select layer bounds

Browse Source
This commit is contained in:
David Capello 2018-03-29 18:53:03 -03:00
parent 498ffcbaae
commit d55e00aea0
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/app/util/layer_boundaries.cpp
View File

@ -11,6 +11,7 @@
#include "app/util/layer_boundaries.h"
#include "app/cmd/set_mask.h"
#include "app/console.h"
#include "app/context_access.h"
#include "app/modules/gui.h"
#include "app/transaction.h"
@ -94,38 +95,43 @@ void select_layer_boundaries(Layer* layer,
}
}
ContextWriter writer(UIContext::instance());
app::Document* doc = writer.document();
Sprite* spr = layer->sprite();
ASSERT(doc == spr->document());
try {
ContextWriter writer(UIContext::instance(), 500);
app::Document* doc = writer.document();
Sprite* spr = layer->sprite();
ASSERT(doc == spr->document());
if (doc->isMaskVisible()) {
switch (op) {
case SelectLayerBoundariesOp::REPLACE:
// newMask is the new mask
break;
case SelectLayerBoundariesOp::ADD:
newMask.add(*doc->mask());
break;
case SelectLayerBoundariesOp::SUBTRACT: {
Mask oldMask(*doc->mask());
oldMask.subtract(newMask);
newMask.copyFrom(&oldMask); // TODO use something like std::swap()
break;
if (doc->isMaskVisible()) {
switch (op) {
case SelectLayerBoundariesOp::REPLACE:
// newMask is the new mask
break;
case SelectLayerBoundariesOp::ADD:
newMask.add(*doc->mask());
break;
case SelectLayerBoundariesOp::SUBTRACT: {
Mask oldMask(*doc->mask());
oldMask.subtract(newMask);
newMask.copyFrom(&oldMask); // TODO use something like std::swap()
break;
}
case SelectLayerBoundariesOp::INTERSECT:
newMask.intersect(*doc->mask());
break;
}
case SelectLayerBoundariesOp::INTERSECT:
newMask.intersect(*doc->mask());
break;
}
Transaction transaction(writer.context(), "Select Layer Boundaries", DoesntModifyDocument);
transaction.execute(new cmd::SetMask(doc, &newMask));
transaction.commit();
doc->resetTransformation();
doc->generateMaskBoundaries();
update_screen_for_document(doc);
}
catch (base::Exception& e) {
Console::showException(e);
}
Transaction transaction(writer.context(), "Select Layer Boundaries", DoesntModifyDocument);
transaction.execute(new cmd::SetMask(doc, &newMask));
transaction.commit();
doc->resetTransformation();
doc->generateMaskBoundaries();
update_screen_for_document(doc);
}
} // namespace app