diff options
| author | Jasper van de Gronde <jasper.vandegronde@gmail.com> | 2008-03-21 19:53:10 +0000 |
|---|---|---|
| committer | jaspervdg <jaspervdg@users.sourceforge.net> | 2008-03-21 19:53:10 +0000 |
| commit | 40a243a7a5e67d4f09a82bfbee5babe40ec924b7 (patch) | |
| tree | 5f43830b59a1c448f880a39cd2d23b8cc1058d97 /src/widgets | |
| parent | Start working toward multiple inheritance (diff) | |
| download | inkscape-40a243a7a5e67d4f09a82bfbee5babe40ec924b7.tar.gz inkscape-40a243a7a5e67d4f09a82bfbee5babe40ec924b7.zip | |
No more NRMatrix or NRPoint.
(bzr r5149)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/font-selector.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/icon.cpp | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp index 6745fcc59..c6d23eee2 100644 --- a/src/widgets/font-selector.cpp +++ b/src/widgets/font-selector.cpp @@ -615,7 +615,7 @@ static gint sp_font_preview_expose(GtkWidget *widget, GdkEventExpose *event) font_instance *tface = fprev->rfont->daddy; - double theSize = NR_MATRIX_DF_EXPANSION (&fprev->rfont->style.transform); + double theSize = NR::expansion(fprev->rfont->style.transform); gchar const *p; if (fprev->phrase) { @@ -794,8 +794,7 @@ void sp_font_preview_set_font(SPFontPreview *fprev, font_instance *font, SPFontS if (fprev->font) { - NRMatrix flip; - nr_matrix_set_scale (&flip, fsel->fontsize, -fsel->fontsize); + NR::Matrix flip(NR::scale(fsel->fontsize, -fsel->fontsize)); fprev->rfont = fprev->font->RasterFont(flip, 0); } diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index 8c582da83..498a24998 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -623,10 +623,8 @@ sp_icon_doc_icon( SPDocument *doc, NRArenaItem *root, NRGC gc(NULL); /* Update to renderable state */ double sf = 1.0; - NRMatrix t; - nr_matrix_set_scale(&t, sf, sf); - nr_arena_item_set_transform(root, &t); - nr_matrix_set_identity(&gc.transform); + nr_arena_item_set_transform(root, NR::Matrix(NR::scale(sf, sf))); + gc.transform.set_identity(); nr_arena_item_invoke_update( root, NULL, &gc, NR_ARENA_ITEM_STATE_ALL, NR_ARENA_ITEM_STATE_NONE ); @@ -657,9 +655,8 @@ sp_icon_doc_icon( SPDocument *doc, NRArenaItem *root, } sf = (double)psize / (double)block; - nr_matrix_set_scale(&t, sf, sf); - nr_arena_item_set_transform(root, &t); - nr_matrix_set_identity(&gc.transform); + nr_arena_item_set_transform(root, NR::Matrix(NR::scale(sf, sf))); + gc.transform.set_identity(); nr_arena_item_invoke_update( root, NULL, &gc, NR_ARENA_ITEM_STATE_ALL, NR_ARENA_ITEM_STATE_NONE ); |