From d19b5c4cb05b676d3fd400400dfb3c93a64630b1 Mon Sep 17 00:00:00 2001 From: Yousef Khadadeh Date: Wed, 30 Jul 2025 11:45:18 +0300 Subject: [PATCH] Files no longer render name, and also fixed a bug where the very first object can't be edited --- src/DrawingProgram/EditTool.cpp | 2 +- src/ResourceDisplay/FileResourceDisplay.cpp | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/DrawingProgram/EditTool.cpp b/src/DrawingProgram/EditTool.cpp index b1854f0..578482b 100644 --- a/src/DrawingProgram/EditTool.cpp +++ b/src/DrawingProgram/EditTool.cpp @@ -135,7 +135,7 @@ void EditTool::tool_update() { drawP.compCache.traverse_bvh_run_function(mouseAABB, [&](const std::shared_ptr& bvhNode, const std::vector& 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; } diff --git a/src/ResourceDisplay/FileResourceDisplay.cpp b/src/ResourceDisplay/FileResourceDisplay.cpp index 319a5ab..6a5c8c9 100644 --- a/src/ResourceDisplay/FileResourceDisplay.cpp +++ b/src/ResourceDisplay/FileResourceDisplay.cpp @@ -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 {