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/dialog/export.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/ui/dialog/export.cpp') diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index 160f83965..2c1ebb45d 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -1050,7 +1050,7 @@ void Export::onExport () } pHYs = (pHYs_adj->get_value() > 0.01) ? pHYs_adj->get_value() : dpi; - Geom::OptRect area = item->desktopVisualBounds(); + Geom::OptRect area = item->documentVisualBounds(); if (area) { gint width = (gint) (area->width() * dpi / DPI_BASE + 0.5); gint height = (gint) (area->height() * dpi / DPI_BASE + 0.5); @@ -1154,11 +1154,13 @@ void Export::onExport () prog_dlg->set_data("current", GINT_TO_POINTER(0)); prog_dlg->set_data("total", GINT_TO_POINTER(0)); + auto area = Geom::Rect(Geom::Point(x0, y0), Geom::Point(x1, y1)) * desktop->dt2doc(); + /* Do export */ std::vector x; std::vector selected(desktop->getSelection()->items().begin(), desktop->getSelection()->items().end()); ExportResult status = sp_export_png_file(desktop->getDocument(), path.c_str(), - Geom::Rect(Geom::Point(x0, y0), Geom::Point(x1, y1)), width, height, pHYs, pHYs, //previously xdpi, ydpi. + area, width, height, pHYs, pHYs, //previously xdpi, ydpi. nv->pagecolor, onProgressCallback, (void*)prog_dlg, FALSE, -- cgit v1.2.3