copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Added erase many and place many canvas undo

Browse source
This commit is contained in:
Yousef Khadadeh 2026-01-04 16:50:47 +03:00
parent 2dec0ab2c5
commit 279801623d
7 changed files with 291 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/DrawingProgram/Layers/DrawingProgramLayerManager.hpp
View file

@ -13,6 +13,9 @@ class DrawingProgramLayerManager {
NetworkingObjects::NetObjOwnerPtr<DrawingProgramLayerListItem> layerTreeRoot;
NetworkingObjects::NetObjWeakPtr<DrawingProgramLayerListItem> editingLayer;
void set_initial_editing_layer();
void add_undo_erase_components(const std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>>& eraseMap);
void add_undo_place_components(DrawingProgramLayerListItem* parent, const std::vector<CanvasComponentContainer::ObjInfoIterator>& placeList);
void erase_component_map(const std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>>& eraseMap);
bool commitUpdateOnComponentInsert = true;
public:
enum class LayerSelector {
@ -28,12 +31,16 @@ class DrawingProgramLayerManager {
bool is_a_layer_being_edited();
void scale_up(const WorldScalar& scaleUpAmount);
template <typename List> void erase_component_container(const List& compsToErase) {
std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>> idsToEraseInSpecificLayers;
for(auto& c : compsToErase)
idsToEraseInSpecificLayers[c->obj->parentLayer].emplace_back(c->obj->objInfo);
for(auto& [layerListItem, netObjSetToErase] : idsToEraseInSpecificLayers) {
auto& layerComponentList = layerListItem->get_layer().components;
layerComponentList->erase_list(layerComponentList, netObjSetToErase);
if(!compsToErase.empty()) {
std::unordered_map<DrawingProgramLayerListItem*, std::vector<CanvasComponentContainer::ObjInfoIterator>> idsToEraseInSpecificLayers;
for(auto& c : compsToErase)
idsToEraseInSpecificLayers[c->obj->parentLayer].emplace_back(c->obj->objInfo);
for(auto& [parent, its] : idsToEraseInSpecificLayers) {
std::sort(its.begin(), its.end(), [](auto& a, auto& b) {
return a->pos < b->pos;
});
}
erase_component_map(idsToEraseInSpecificLayers);
}
}
uint32_t edited_layer_component_count();
@ -52,5 +59,7 @@ class DrawingProgramLayerManager {
std::vector<CanvasComponentContainer::ObjInfoIterator> add_many_components_to_layer_being_edited(const std::vector<std::pair<CanvasComponentContainer::ObjInfoIterator, CanvasComponentContainer*>>& newObjs);
std::vector<CanvasComponentContainer::ObjInfo*> get_flattened_component_list() const;
std::vector<DrawingProgramLayerListItem*> get_flattened_layer_list();
void add_undo_place_component(CanvasComponentContainer::ObjInfo* objInfo);
DrawingProgramLayerManagerGUI listGUI;
};