diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-09-18 17:48:42 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-09-18 17:48:42 +0000 |
| commit | 07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8 (patch) | |
| tree | 3a4c8c7f4f8de2878adbe5eabaf75460d35b8bcb /src/text-editing.cpp | |
| parent | NR ==> Geom conversion in sp-canvas (diff) | |
| download | inkscape-07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8.tar.gz inkscape-07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8.zip | |
Next roud of NR ==> Geom conversion
(bzr r6839)
Diffstat (limited to 'src/text-editing.cpp')
| -rw-r--r-- | src/text-editing.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/text-editing.cpp b/src/text-editing.cpp index 48266cfce..11b0f0fe4 100644 --- a/src/text-editing.cpp +++ b/src/text-editing.cpp @@ -948,8 +948,8 @@ sp_te_adjust_kerning_screen (SPItem *item, Inkscape::Text::Layout::iterator cons // divide increment by zoom // divide increment by matrix expansion gdouble factor = 1 / desktop->current_zoom(); - NR::Matrix t (sp_item_i2doc_affine(item)); - factor = factor / NR::expansion(t); + Geom::Matrix t (sp_item_i2doc_affine(item)); + factor = factor / t.descrim(); by = factor * by; unsigned char_index; @@ -970,8 +970,8 @@ sp_te_adjust_rotation_screen(SPItem *text, Inkscape::Text::Layout::iterator cons // divide increment by zoom // divide increment by matrix expansion gdouble factor = 1 / desktop->current_zoom(); - NR::Matrix t (sp_item_i2doc_affine(text)); - factor = factor / NR::expansion(t); + Geom::Matrix t (sp_item_i2doc_affine(text)); + factor = factor / t.descrim(); Inkscape::Text::Layout const *layout = te_get_layout(text); if (layout == NULL) return; SPObject *source_item = 0; @@ -1055,7 +1055,7 @@ sp_te_adjust_tspan_letterspacing_screen(SPItem *text, Inkscape::Text::Layout::it gdouble const zoom = desktop->current_zoom(); gdouble const zby = (by / (zoom * (nb_let > 1 ? nb_let - 1 : 1)) - / NR::expansion(sp_item_i2doc_affine(SP_ITEM(source_obj)))); + / to_2geom(sp_item_i2doc_affine(SP_ITEM(source_obj))).descrim()); val += zby; if (start == end) { @@ -1127,8 +1127,8 @@ sp_te_adjust_linespacing_screen (SPItem *text, Inkscape::Text::Layout::iterator gdouble zby = by / (desktop->current_zoom() * (line_count == 0 ? 1 : line_count)); // divide increment by matrix expansion - NR::Matrix t (sp_item_i2doc_affine (SP_ITEM(text))); - zby = zby / NR::expansion(t); + Geom::Matrix t (sp_item_i2doc_affine (SP_ITEM(text))); + zby = zby / t.descrim(); switch (style->line_height.unit) { case SP_CSS_UNIT_NONE: |