diff --git a/src/commands/cmd_duplicate_layer.cpp b/src/commands/cmd_duplicate_layer.cpp index 2df62bfe5..4f07d2a56 100644 --- a/src/commands/cmd_duplicate_layer.cpp +++ b/src/commands/cmd_duplicate_layer.cpp @@ -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); diff --git a/src/commands/cmd_merge_down_layer.cpp b/src/commands/cmd_merge_down_layer.cpp index 67da5ee77..4e4b643c8 100644 --- a/src/commands/cmd_merge_down_layer.cpp +++ b/src/commands/cmd_merge_down_layer.cpp @@ -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; diff --git a/src/commands/cmd_new_layer_set.cpp b/src/commands/cmd_new_layer_set.cpp index 8611a08a7..4d8823dfc 100644 --- a/src/commands/cmd_new_layer_set.cpp +++ b/src/commands/cmd_new_layer_set.cpp @@ -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); diff --git a/src/dialogs/aniedit.cpp b/src/dialogs/aniedit.cpp index bda08e7ce..07e6f2700 100644 --- a/src/dialogs/aniedit.cpp +++ b/src/dialogs/aniedit.cpp @@ -594,8 +594,8 @@ bool AnimationEditor::onProcessMessage(Message* msg) Sprite* sprite_writer = const_cast(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. diff --git a/src/document.cpp b/src/document.cpp index 0eee49d20..1327db53f 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -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 diff --git a/src/file/ase_format.cpp b/src/file/ase_format.cpp index c13b57bc9..4826eff25 100644 --- a/src/file/ase_format.cpp +++ b/src/file/ase_format.cpp @@ -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(*previous_layer)->add_layer(layer); + static_cast(*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; diff --git a/src/file/file.cpp b/src/file/file.cpp index ac7ffff65..8cb816510 100644 --- a/src/file/file.cpp +++ b/src/file/file.cpp @@ -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); diff --git a/src/file/fli_format.cpp b/src/file/fli_format.cpp index 5cc14516d..f6c0284fd 100644 --- a/src/file/fli_format.cpp +++ b/src/file/fli_format.cpp @@ -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 diff --git a/src/file/gif_format.cpp b/src/file/gif_format.cpp index 29a3b112e..00a9e6c3d 100644 --- a/src/file/gif_format.cpp +++ b/src/file/gif_format.cpp @@ -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) diff --git a/src/file/ico_format.cpp b/src/file/ico_format.cpp index ca491ef9e..ab551e903 100644 --- a/src/file/ico_format.cpp +++ b/src/file/ico_format.cpp @@ -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); diff --git a/src/raster/layer.cpp b/src/raster/layer.cpp index a3fbb5881..ecd7b6c4e 100644 --- a/src/raster/layer.cpp +++ b/src/raster/layer.cpp @@ -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()); diff --git a/src/raster/layer.h b/src/raster/layer.h index 6f2f8f835..1ea9253a8 100644 --- a/src/raster/layer.h +++ b/src/raster/layer.h @@ -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); diff --git a/src/raster/layer_io.cpp b/src/raster/layer_io.cpp index 26a494a1a..5d30b06d1 100644 --- a/src/raster/layer_io.cpp +++ b/src/raster/layer_io.cpp @@ -132,7 +132,7 @@ Layer* read_layer(std::istream& is, LayerSubObjectsSerializer* subObjects, Sprit for (int c=0; cread_layer(is); if (child) - static_cast(layer.get())->add_layer(child); + static_cast(layer.get())->addLayer(child); else break; } diff --git a/src/undo_transaction.cpp b/src/undo_transaction.cpp index 8ca69184e..f9a40d781 100644 --- a/src/undo_transaction.cpp +++ b/src/undo_transaction.cpp @@ -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; diff --git a/src/undo_transaction.h b/src/undo_transaction.h index d05096b8a..db712eb4f 100644 --- a/src/undo_transaction.h +++ b/src/undo_transaction.h @@ -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); diff --git a/src/undoers/add_layer.cpp b/src/undoers/add_layer.cpp index a75801a89..dad1f8543 100644 --- a/src/undoers/add_layer.cpp +++ b/src/undoers/add_layer.cpp @@ -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; } diff --git a/src/undoers/move_layer.cpp b/src/undoers/move_layer.cpp index c7fdaf77b..40ee1582f 100644 --- a/src/undoers/move_layer.cpp +++ b/src/undoers/move_layer.cpp @@ -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); } diff --git a/src/undoers/remove_layer.cpp b/src/undoers/remove_layer.cpp index d4bf61530..f7a13bbe2 100644 --- a/src/undoers/remove_layer.cpp +++ b/src/undoers/remove_layer.cpp @@ -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); }