Rename Layer::add/remove/move_layer member functions to add/remove/stackLayer.

This commit is contained in:
David Capello 2012-08-18 22:21:42 -03:00
parent 3f7d7b00b7
commit 85f7bf8ba8
18 changed files with 36 additions and 36 deletions

View File

@ -88,7 +88,7 @@ void DuplicateLayerCommand::onExecute(Context* context)
undo.pushUndoer(new undoers::AddLayer(undo.getObjects(),
sourceLayer->get_parent(), newLayerPtr));
sourceLayer->get_parent()->add_layer(newLayerPtr);
sourceLayer->get_parent()->addLayer(newLayerPtr);
// Release the pointer as it is owned by the sprite now
Layer* newLayer = newLayerPtr.release();
@ -100,7 +100,7 @@ void DuplicateLayerCommand::onExecute(Context* context)
undo.commit();
sourceLayer->get_parent()->move_layer(newLayer, sourceLayer);
sourceLayer->get_parent()->stackLayer(newLayer, sourceLayer);
sprite->setCurrentLayer(newLayer);
update_screen_for_document(document);

View File

@ -185,7 +185,7 @@ void MergeDownLayerCommand::onExecute(Context* context)
}
sprite->setCurrentLayer(dst_layer);
src_layer->get_parent()->remove_layer(src_layer);
src_layer->get_parent()->removeLayer(src_layer);
delete src_layer;

View File

@ -72,7 +72,7 @@ void NewLayerSetCommand::onExecute(Context* context)
Layer* layer = new LayerFolder(sprite);
layer->setName(name);
sprite->getFolder()->add_layer(layer);
sprite->getFolder()->addLayer(layer);
sprite->setCurrentLayer(layer);
update_screen_for_document(document);

View File

@ -594,8 +594,8 @@ bool AnimationEditor::onProcessMessage(Message* msg)
Sprite* sprite_writer = const_cast<Sprite*>(m_sprite);
UndoTransaction undoTransaction(document_writer, "Move Layer");
undoTransaction.moveLayerAfter(m_layers[m_clk_layer],
m_layers[m_hot_layer]);
undoTransaction.restackLayerAfter(m_layers[m_clk_layer],
m_layers[m_hot_layer]);
undoTransaction.commit();
// Select the new layer.

View File

@ -113,7 +113,7 @@ Document* Document::createBasicDocument(PixelFormat format, int width, int heigh
}
// Add the layer in the sprite.
sprite->getFolder()->add_layer(layer);
sprite->getFolder()->addLayer(layer);
// Set the layer as the current one.
sprite->setCurrentLayer(layer.release()); // Release the layer because it's owned by the sprite
@ -390,7 +390,7 @@ void Document::copyLayerContent(const Layer* sourceLayer0, Document* destDoc, La
undo->pushUndoer(new undoers::AddLayer(undo->getObjects(),
destLayer, destChild));
destLayer->add_layer(destChild);
destLayer->addLayer(destChild);
destChild.release();
}
}
@ -457,7 +457,7 @@ Document* Document::duplicate(DuplicateType type) const
FrameNumber(0), sourceSprite->getLastFrame());
// Add and select the new flat layer
spriteCopy->getFolder()->add_layer(flatLayer);
spriteCopy->getFolder()->addLayer(flatLayer);
spriteCopy->setCurrentLayer(flatLayer);
// Configure the layer as background only if the original

View File

@ -667,11 +667,11 @@ static Layer *ase_file_read_layer_chunk(FILE *f, Sprite *sprite, Layer **previou
// child level...
if (child_level == *current_level)
(*previous_layer)->get_parent()->add_layer(layer);
(*previous_layer)->get_parent()->addLayer(layer);
else if (child_level > *current_level)
static_cast<LayerFolder*>(*previous_layer)->add_layer(layer);
static_cast<LayerFolder*>(*previous_layer)->addLayer(layer);
else if (child_level < *current_level)
(*previous_layer)->get_parent()->get_parent()->add_layer(layer);
(*previous_layer)->get_parent()->get_parent()->addLayer(layer);
*previous_layer = layer;
*current_level = child_level;

View File

@ -700,7 +700,7 @@ Image* fop_sequence_image(FileOp* fop, PixelFormat pixelFormat, int w, int h)
LayerImage* layer = new LayerImage(sprite);
// Add the layer
sprite->getFolder()->add_layer(layer);
sprite->getFolder()->addLayer(layer);
// Done
fop->document = new Document(sprite);

View File

@ -110,7 +110,7 @@ bool FliFormat::onLoad(FileOp* fop)
// Create the image
sprite = new Sprite(IMAGE_INDEXED, w, h, 256);
layer = new LayerImage(sprite);
sprite->getFolder()->add_layer(layer);
sprite->getFolder()->addLayer(layer);
layer->configureAsBackground();
// Set frames and speed

View File

@ -336,7 +336,7 @@ bool GifFormat::onPostLoad(FileOp* fop)
// Create the main layer
LayerImage* layer = new LayerImage(sprite);
sprite->getFolder()->add_layer(layer);
sprite->getFolder()->addLayer(layer);
if (pixelFormat == IMAGE_INDEXED) {
if (data->bgcolor_index >= 0)

View File

@ -133,7 +133,7 @@ bool IcoFormat::onLoad(FileOp* fop)
// Create the sprite with one background layer
Sprite* sprite = new Sprite(pixelFormat, width, height, numcolors);
LayerImage* layer = new LayerImage(sprite);
sprite->getFolder()->add_layer(layer);
sprite->getFolder()->addLayer(layer);
// Create the first image/cel
Image* image = Image::create(pixelFormat, width, height);

View File

@ -210,7 +210,7 @@ void LayerImage::configureAsBackground()
set_background(true);
setName("Background");
getSprite()->getFolder()->move_layer(this, NULL);
getSprite()->getFolder()->stackLayer(this, NULL);
}
//////////////////////////////////////////////////////////////////////
@ -262,13 +262,13 @@ void LayerFolder::getCels(CelList& cels)
(*it)->getCels(cels);
}
void LayerFolder::add_layer(Layer* layer)
void LayerFolder::addLayer(Layer* layer)
{
m_layers.push_back(layer);
layer->set_parent(this);
}
void LayerFolder::remove_layer(Layer* layer)
void LayerFolder::removeLayer(Layer* layer)
{
LayerIterator it = std::find(m_layers.begin(), m_layers.end(), layer);
ASSERT(it != m_layers.end());
@ -277,7 +277,7 @@ void LayerFolder::remove_layer(Layer* layer)
layer->set_parent(NULL);
}
void LayerFolder::move_layer(Layer* layer, Layer* after)
void LayerFolder::stackLayer(Layer* layer, Layer* after)
{
LayerIterator it = std::find(m_layers.begin(), m_layers.end(), layer);
ASSERT(it != m_layers.end());

View File

@ -140,9 +140,9 @@ public:
LayerConstIterator get_layer_end() const { return m_layers.end(); }
int get_layers_count() const { return m_layers.size(); }
void add_layer(Layer* layer);
void remove_layer(Layer* layer);
void move_layer(Layer* layer, Layer* after);
void addLayer(Layer* layer);
void removeLayer(Layer* layer);
void stackLayer(Layer* layer, Layer* after);
void getCels(CelList& cels);

View File

@ -132,7 +132,7 @@ Layer* read_layer(std::istream& is, LayerSubObjectsSerializer* subObjects, Sprit
for (int c=0; c<layers; c++) {
Layer* child = subObjects->read_layer(is);
if (child)
static_cast<LayerFolder*>(layer.get())->add_layer(child);
static_cast<LayerFolder*>(layer.get())->addLayer(child);
else
break;
}

View File

@ -383,7 +383,7 @@ LayerImage* UndoTransaction::newLayer()
m_undo->pushUndoer(new undoers::AddLayer(m_undo->getObjects(),
m_sprite->getFolder(), layer));
m_sprite->getFolder()->add_layer(layer);
m_sprite->getFolder()->addLayer(layer);
// select the new layer
setCurrentLayer(layer);
@ -426,18 +426,18 @@ void UndoTransaction::removeLayer(Layer* layer)
m_undo->pushUndoer(new undoers::RemoveLayer(m_undo->getObjects(),
layer));
parent->remove_layer(layer);
parent->removeLayer(layer);
// destroy the layer
delete layer;
}
void UndoTransaction::moveLayerAfter(Layer* layer, Layer* afterThis)
void UndoTransaction::restackLayerAfter(Layer* layer, Layer* afterThis)
{
if (isEnabled())
m_undo->pushUndoer(new undoers::MoveLayer(m_undo->getObjects(), layer));
layer->get_parent()->move_layer(layer, afterThis);
layer->get_parent()->stackLayer(layer, afterThis);
}
void UndoTransaction::cropLayer(Layer* layer, int x, int y, int w, int h, int bgcolor)
@ -593,7 +593,7 @@ void UndoTransaction::flattenLayers(int bgcolor)
m_undo->pushUndoer(new undoers::AddLayer(m_undo->getObjects(),
m_sprite->getFolder(), background));
m_sprite->getFolder()->add_layer(background);
m_sprite->getFolder()->addLayer(background);
if (isEnabled())
m_undo->pushUndoer(new undoers::MoveLayer(m_undo->getObjects(),
@ -662,7 +662,7 @@ void UndoTransaction::flattenLayers(int bgcolor)
m_undo->pushUndoer(new undoers::RemoveLayer(m_undo->getObjects(),
old_layer));
m_sprite->getFolder()->remove_layer(old_layer);
m_sprite->getFolder()->removeLayer(old_layer);
// Destroy the layer
delete old_layer;

View File

@ -96,7 +96,7 @@ public:
// for layers
LayerImage* newLayer();
void removeLayer(Layer* layer);
void moveLayerAfter(Layer* layer, Layer* afterThis);
void restackLayerAfter(Layer* layer, Layer* afterThis);
void cropLayer(Layer* layer, int x, int y, int w, int h, int bgcolor);
void displaceLayers(Layer* layer, int dx, int dy);
void backgroundFromLayer(LayerImage* layer, int bgcolor);

View File

@ -46,6 +46,6 @@ void AddLayer::revert(ObjectsContainer* objects, UndoersCollector* redoers)
redoers->pushUndoer(new RemoveLayer(objects, layer));
folder->remove_layer(layer);
folder->removeLayer(layer);
delete layer;
}

View File

@ -50,6 +50,6 @@ void MoveLayer::revert(ObjectsContainer* objects, UndoersCollector* redoers)
// Backup the current layer position
redoers->pushUndoer(new MoveLayer(objects, layer));
// Move the layer
folder->move_layer(layer, after);
// Restack the layer
folder->stackLayer(layer, after);
}

View File

@ -115,6 +115,6 @@ void RemoveLayer::revert(ObjectsContainer* objects, UndoersCollector* redoers)
// Push an AddLayer as redoer
redoers->pushUndoer(new AddLayer(objects, folder, layer));
folder->add_layer(layer);
folder->move_layer(layer, after);
folder->addLayer(layer);
folder->stackLayer(layer, after);
}