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

Fixed multiple segfault bugs

Browse source
This commit is contained in:
Yousef Khadadeh 2025-12-30 21:18:59 +03:00
parent fda8fcc166
commit caf99a8675
7 changed files with 41 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/Helpers/NetworkingObjects/NetObjOrderedList.hpp
View file

@ -515,18 +515,18 @@ namespace NetworkingObjects {
serverIdToDataMap.emplace(newObjs[i].second.get_net_id(), serverIt);
}
std::vector<NetObjOrderedListIterator<T>> insertedIterators;
auto firstInsertedIt = clientData.end();
for(uint32_t i = 0; i < newObjs.size(); i++) {
auto& [itToInsertAt, newObj] = newObjs[i];
auto newObjIt = clientData.emplace(itToInsertAt, std::move(newObj), itToInsertAt == clientData.end() ? clientData.size() : itToInsertAt->pos); // All position values will be wrong except the first one, which is all that matters
clientIdToDataMap.emplace(newObjIt->obj.get_net_id(), newObjIt);
insertedIterators.emplace_back(newObjIt);
if(i == 0)
firstInsertedIt = newObjIt;
}
set_position_obj_info_list<T>(firstInsertedIt, clientData.end());
for(auto& newObj : newObjs)
this->call_insert_callback(newObj.first);
this->call_insert_callback_list(insertedIterators);
break;
}

20
src/DrawingProgram/Layers/DrawingProgramLayer.cpp
View file

@ -8,16 +8,16 @@ void DrawingProgramLayer::draw(SkCanvas* canvas, const DrawData& drawData) const
p.obj->draw(canvas, drawData);
}
void DrawingProgramLayer::set_component_list_callbacks(DrawingProgramLayerListItem& layerListItem, DrawingProgramLayerManager& layerMan) const {
components->set_insert_callback([&](const CanvasComponentContainer::ObjInfoIterator& c) {
void DrawingProgramLayer::set_component_list_callbacks(DrawingProgramLayerListItem& layerListItem, DrawingProgramLayerManager& layerMan) {
auto insertCallback = [&](const CanvasComponentContainer::ObjInfoIterator& c) {
c->obj->objInfo = c;
c->obj->parentLayer = &layerListItem;
c->obj->commit_update(layerMan.drawP); // Run commit update on insert so that world bounds are calculated
layerMan.drawP.drawCache.add_component(&(*c));
if(c->obj->get_comp().get_type() == CanvasComponentType::IMAGE)
layerMan.drawP.updateableComponents.emplace(&(*c));
});
components->set_erase_callback([&](const CanvasComponentContainer::ObjInfoIterator& c) {
};
eraseCallback = [&](const CanvasComponentContainer::ObjInfoIterator& c) {
layerMan.drawP.selection.erase_component(&(*c));
layerMan.drawP.drawCache.erase_component(&(*c));
layerMan.drawP.drawTool->erase_component(&(*c));
@ -25,10 +25,20 @@ void DrawingProgramLayer::set_component_list_callbacks(DrawingProgramLayerListIt
return downloadingFile.comp == &(*c);
});
layerMan.drawP.updateableComponents.erase(&(*c));
});
};
components->set_insert_callback(insertCallback);
components->set_erase_callback(eraseCallback);
components->set_move_callback([&](const CanvasComponentContainer::ObjInfoIterator& c, uint32_t oldPos) {
layerMan.drawP.drawCache.invalidate_cache_at_aabb(c->obj->get_world_bounds());
});
// Make sure the insert callback is called on existing objects
for(auto it = components->begin(); it != components->end(); ++it)
insertCallback(it);
}
void DrawingProgramLayer::set_to_erase() {
for(auto it = components->begin(); it != components->end(); ++it)
eraseCallback(it);
}
void DrawingProgramLayer::commit_update_dont_invalidate_cache(DrawingProgramLayerManager& layerMan) const {

5
src/DrawingProgram/Layers/DrawingProgramLayer.hpp
View file

@ -9,9 +9,12 @@ class DrawingProgramLayerManager;
class DrawingProgramLayer {
public:
void draw(SkCanvas* canvas, const DrawData& drawData) const;
void set_component_list_callbacks(DrawingProgramLayerListItem& layerListItem, DrawingProgramLayerManager& layerMan) const;
void set_component_list_callbacks(DrawingProgramLayerListItem& layerListItem, DrawingProgramLayerManager& layerMan);
void commit_update_dont_invalidate_cache(DrawingProgramLayerManager& layerMan) const;
void get_flattened_component_list(std::vector<CanvasComponentContainer::ObjInfo*>& objList) const;
void set_to_erase();
CanvasComponentContainer::NetListOwnerPtr components;
private:
std::function<void(const CanvasComponentContainer::ObjInfoIterator& c)> eraseCallback;
};

10
src/DrawingProgram/Layers/DrawingProgramLayerFolder.cpp
View file

@ -8,14 +8,22 @@ void DrawingProgramLayerFolder::draw(SkCanvas* canvas, const DrawData& drawData)
p.obj->draw(canvas, drawData);
}
void DrawingProgramLayerFolder::set_component_list_callbacks(DrawingProgramLayerManager& layerMan) const {
void DrawingProgramLayerFolder::set_component_list_callbacks(DrawingProgramLayerManager& layerMan) {
folderList->set_insert_callback([&](auto& c) {
c->obj->set_component_list_callbacks(layerMan);
});
folderList->set_erase_callback([&](auto& c) {
c->obj->set_to_erase();
});
for(auto& listItem : *folderList)
listItem.obj->set_component_list_callbacks(layerMan);
}
void DrawingProgramLayerFolder::set_to_erase() {
for(auto& listItem : *folderList)
listItem.obj->set_to_erase();
}
void DrawingProgramLayerFolder::commit_update_dont_invalidate_cache(DrawingProgramLayerManager& layerMan) const {
for(auto& listItem : *folderList)
listItem.obj->commit_update_dont_invalidate_cache(layerMan);

3
src/DrawingProgram/Layers/DrawingProgramLayerFolder.hpp
View file

@ -10,9 +10,10 @@ class DrawingProgramLayerManager;
class DrawingProgramLayerFolder {
public:
void draw(SkCanvas* canvas, const DrawData& drawData) const;
void set_component_list_callbacks(DrawingProgramLayerManager& layerMan) const;
void set_component_list_callbacks(DrawingProgramLayerManager& layerMan);
void commit_update_dont_invalidate_cache(DrawingProgramLayerManager& layerMan) const;
void get_flattened_component_list(std::vector<CanvasComponentContainer::ObjInfo*>& objList) const;
void set_to_erase();
NetworkingObjects::NetObjOwnerPtr<NetworkingObjects::NetObjOrderedList<DrawingProgramLayerListItem>> folderList;
bool isFolderOpen = false;

7
src/DrawingProgram/Layers/DrawingProgramLayerListItem.cpp
View file

@ -32,6 +32,13 @@ void DrawingProgramLayerListItem::reassign_netobj_ids_call() {
displayData.reassign_ids();
}
void DrawingProgramLayerListItem::set_to_erase() {
if(folderData)
folderData->set_to_erase();
else
layerData->set_to_erase();
}
void DrawingProgramLayerListItem::set_component_list_callbacks(DrawingProgramLayerManager &layerMan) {
if(folderData)
folderData->set_component_list_callbacks(layerMan);

1
src/DrawingProgram/Layers/DrawingProgramLayerListItem.hpp
View file

@ -21,6 +21,7 @@ class DrawingProgramLayerListItem {
DrawingProgramLayer& get_layer() const;
static void register_class(World& w);
void reassign_netobj_ids_call();
void set_to_erase();
void set_component_list_callbacks(DrawingProgramLayerManager &layerMan);
void commit_update_dont_invalidate_cache(DrawingProgramLayerManager& layerMan);
void draw(SkCanvas* canvas, const DrawData& drawData) const;