From 3ffefe1e05e3858ce6584dc644817c411232dc77 Mon Sep 17 00:00:00 2001 From: Thomas Holder Date: Sun, 18 Aug 2019 17:29:16 +0200 Subject: reduce usage of desktop coordinates (#341) - avoid unnecessary internal usage of desktop coordinates, e.g. in SpellCheck::compareTextBboxes - document whether a function argument is in document or desktop coordinates, e.g. for SPDocument::getItemsInBox --- src/ui/tools/measure-tool.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/ui/tools/measure-tool.cpp') diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 6633cdd64..568d8c542 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -1260,8 +1260,10 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, bool to_phantom, dimension_offset = 70; Geom::PathVector lineseg; Geom::Path p; - p.start(desktop->dt2doc(start_p)); - p.appendNew(desktop->dt2doc(end_p)); + Geom::Point start_p_doc = start_p * desktop->dt2doc(); + Geom::Point end_p_doc = end_p * desktop->dt2doc(); + p.start(start_p_doc); + p.appendNew(end_p_doc); lineseg.push_back(p); double angle = atan2(end_p - start_p); @@ -1274,7 +1276,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, bool to_phantom, std::vector items; SPDocument *doc = desktop->getDocument(); - Geom::Rect rect(start_p, end_p); + Geom::Rect rect(start_p_doc, end_p_doc); items = doc->getItemsPartiallyInBox(desktop->dkey, rect, false, true, false, true); Inkscape::LayerModel *layer_model = nullptr; SPObject *current_layer = nullptr; -- cgit v1.2.3