From 4c9d5ef55883fd94094371813f80cfef0befcf74 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Thu, 11 Sep 2008 21:44:48 +0000 Subject: convert almost all libnrtype to Geom:: (bzr r6793) --- src/text-editing.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/text-editing.cpp') diff --git a/src/text-editing.cpp b/src/text-editing.cpp index be098b7e9..48266cfce 100644 --- a/src/text-editing.cpp +++ b/src/text-editing.cpp @@ -78,34 +78,34 @@ sp_te_input_is_empty (SPObject const *item) } Inkscape::Text::Layout::iterator -sp_te_get_position_by_coords (SPItem const *item, NR::Point &i_p) +sp_te_get_position_by_coords (SPItem const *item, Geom::Point const &i_p) { - NR::Matrix im (sp_item_i2d_affine (item)); + Geom::Matrix im (sp_item_i2d_affine (item)); im = im.inverse(); - NR::Point p = i_p * im; + Geom::Point p = i_p * im; Inkscape::Text::Layout const *layout = te_get_layout(item); return layout->getNearestCursorPositionTo(p); } -std::vector sp_te_create_selection_quads(SPItem const *item, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end, NR::Matrix const &transform) +std::vector sp_te_create_selection_quads(SPItem const *item, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end, Geom::Matrix const &transform) { if (start == end) - return std::vector(); + return std::vector(); Inkscape::Text::Layout const *layout = te_get_layout(item); if (layout == NULL) - return std::vector(); + return std::vector(); return layout->createSelectionShape(start, end, transform); } void -sp_te_get_cursor_coords (SPItem const *item, Inkscape::Text::Layout::iterator const &position, NR::Point &p0, NR::Point &p1) +sp_te_get_cursor_coords (SPItem const *item, Inkscape::Text::Layout::iterator const &position, Geom::Point &p0, Geom::Point &p1) { Inkscape::Text::Layout const *layout = te_get_layout(item); double height, rotation; - layout->queryCursorShape(position, &p0, &height, &rotation); - p1 = NR::Point(p0[NR::X] + height * sin(rotation), p0[NR::Y] - height * cos(rotation)); + layout->queryCursorShape(position, p0, height, rotation); + p1 = Geom::Point(p0[NR::X] + height * sin(rotation), p0[NR::Y] - height * cos(rotation)); } SPStyle const * sp_te_style_at_position(SPItem const *text, Inkscape::Text::Layout::iterator const &position) -- cgit v1.2.3