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

Files no longer render name, and also fixed a bug where the very first object can't be edited

Browse source
This commit is contained in:
Yousef Khadadeh 2025-07-30 11:45:18 +03:00
parent b2f2070f95
commit d19b5c4cb0
2 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/DrawingProgram/EditTool.cpp
View file

@ -135,7 +135,7 @@ void EditTool::tool_update() {
drawP.compCache.traverse_bvh_run_function(mouseAABB, [&](const std::shared_ptr<DrawingProgramCacheBVHNode>& bvhNode, const std::vector<CollabListType::ObjectInfoPtr>& components) {
for(auto& c : components) {
if(c->pos > lastPos && c->obj->collides_with_world_coords(drawP.world.drawData.cam.c, cMouseAABB)) {
if(c->pos >= lastPos && c->obj->collides_with_world_coords(drawP.world.drawData.cam.c, cMouseAABB)) {
lastSelectedObj = c;
lastPos = c->pos;
}

10
src/ResourceDisplay/FileResourceDisplay.cpp
View file

@ -44,16 +44,6 @@ void FileResourceDisplay::draw(SkCanvas* canvas, const DrawData& drawData, const
canvas->scale(imRect.width() / svgDom->containerSize().width(), imRect.height() / svgDom->containerSize().height());
svgDom->render(canvas);
canvas->restore();
SkFont f = io->get_font(40.0f);
SkFontMetrics metrics;
f.getMetrics(&metrics);
float nextText = f.measureText(fileName.c_str(), fileName.length(), SkTextEncoding::kUTF8, nullptr);
Vector2f bounds{nextText, - metrics.fAscent + metrics.fDescent};
SkPaint fontPaint(drawData.main->canvasTheme.toolFrontColor);
canvas->drawSimpleText(fileName.c_str(), fileName.length(), SkTextEncoding::kUTF8, imRect.x() + imRect.width() * 0.5f - bounds.x() * 0.5f, imRect.y() + imRect.height() + bounds.y(), f, fontPaint);
}
Vector2f FileResourceDisplay::get_dimensions() const {