omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add history to layer create, delete, move, rename, and merge

Browse Source
This commit is contained in:
omigamedev
2019-06-18 17:39:35 +02:00
parent c48a6da8a6
commit 9ee4bc42b9
12 changed files with 259 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/app_dialogs.cpp
View File

@@ -114,12 +114,11 @@ void App::dialog_newdoc()
layers->clear();
canvas->m_canvas->m_layers.clear();
canvas->m_canvas->m_order.clear();
canvas->m_canvas->resize(res, res);
canvas->reset_camera();
ActionManager::clear();
layers->add_layer("Default", false);
layers->add_layer("Default", false, true);
canvas->m_canvas->m_unsaved = true;
canvas->m_canvas->m_newdoc = false;
@@ -536,8 +535,32 @@ void App::dialog_layer_rename()
dialog->btn_ok->on_click = [this,dialog](Node*)
{
layers->m_current_layer->set_name(dialog->get_name().c_str());
canvas->m_canvas->m_layers[canvas->m_canvas->m_current_layer_idx]->m_name = dialog->get_name();
struct ActionLayerRename : public Action
{
std::string m_old_name;
std::string m_new_name;
bool m_unsaved;
Layer* m_layer;
std::shared_ptr<NodeLayer> m_layer_node;
ActionLayerRename(std::string old_name, std::string new_name, std::shared_ptr<NodeLayer> layer_node, Layer* layer) :
m_old_name(old_name), m_new_name(new_name), m_layer_node(layer_node), m_layer(layer) { }
virtual void run() override { }
virtual size_t memory() override { return 0; }
virtual void undo() override
{
m_layer_node->set_name(m_old_name.c_str());
m_layer->m_name = m_old_name;
}
virtual Action* get_redo() override
{
return new ActionLayerRename(m_new_name, m_old_name, m_layer_node, m_layer);
}
};
auto layer_node = std::static_pointer_cast<NodeLayer>(layers->m_current_layer->shared_from_this());
auto* layer = canvas->m_canvas->m_layers[canvas->m_canvas->m_current_layer_idx].get();
ActionManager::add(new ActionLayerRename(layers->m_current_layer->m_label_text, dialog->get_name(), layer_node, layer));
layer_node->set_name(dialog->get_name().c_str());
layer->m_name = dialog->get_name();
dialog->destroy();
App::I.hideKeyboard();
};