← Back to branch summary

~centralelyon2010/inkscape/imagelinks2

~centralelyon2010/inkscape/imagelinks2

« back to all changes in this revision

Viewing changes to src/desktop-style.cpp

Committer: cilix42
Date: 2008-09-18 17:48:42 UTC
Revision ID: cilix42@users.sourceforge.net-20080918174842-1ad33a7d7gqhv2hq

Next roud of NR ==> Geom conversion

files modified:
src/box3d.cpp

src/desktop-style.cpp

src/desktop.cpp

src/desktop.h

src/display/canvas-arena.cpp

src/display/canvas-axonomgrid.cpp

src/display/canvas-axonomgrid.h

src/display/canvas-bpath.cpp

src/display/canvas-bpath.h

src/display/canvas-grid.cpp

src/display/canvas-grid.h

src/display/gnome-canvas-acetate.cpp

src/display/guideline.cpp

src/display/nr-arena-shape.cpp

src/display/sodipodi-ctrl.cpp

src/display/sodipodi-ctrl.h

src/display/sodipodi-ctrlrect.cpp

src/display/sodipodi-ctrlrect.h

src/display/sp-canvas-util.cpp

src/display/sp-canvas-util.h

src/display/sp-canvas.cpp

src/display/sp-canvas.h

src/display/sp-ctrlline.cpp

src/display/sp-ctrlline.h

src/display/sp-ctrlquadr.cpp

src/display/sp-ctrlquadr.h

src/document.cpp

src/document.h

src/dropper-context.cpp

src/dropper-context.h

src/dyna-draw-context.cpp

src/eraser-context.cpp

src/event-context.cpp

src/flood-context.cpp

src/gradient-context.cpp

src/gradient-context.h

src/gradient-drag.cpp

src/gradient-drag.h

src/interface.cpp

src/libnr/nr-convert2geom.h

src/line-geometry.cpp

src/line-geometry.h

src/livarot/Shape.h

src/livarot/ShapeMisc.cpp

src/marker.cpp

src/marker.h

src/node-context.cpp

src/nodepath.cpp

src/nodepath.h

src/pencil-context.cpp

src/rubberband.cpp

src/rubberband.h

src/selcue.cpp

src/select-context.cpp

src/selection-chemistry.cpp

src/seltrans.cpp

src/shape-editor.cpp

src/shape-editor.h

src/sp-flowtext.cpp

src/sp-image.cpp

src/sp-item-group.cpp

src/sp-item-group.h

src/sp-item.cpp

src/sp-item.h

src/sp-namedview.cpp

src/sp-namedview.h

src/sp-root.cpp

src/sp-root.h

src/sp-shape.cpp

src/sp-symbol.cpp

src/sp-text.cpp

src/sp-tref.cpp

src/sp-tspan.cpp

src/sp-use.cpp

src/splivarot.cpp

src/text-context.cpp

src/text-editing.cpp

src/tweak-context.cpp

src/ui/view/edit-widget.cpp

src/ui/widget/zoom-status.cpp

src/verbs.cpp

src/widgets/desktop-widget.cpp

src/widgets/font-selector.cpp

src/widgets/toolbox.cpp

src/zoom-context.cpp

Show diffs side-by-side

added added

removed removed

src/desktop-style.cpp

120

120

121

121

// Scale the style by the inverse of the accumulated parent transform in the paste context.

122

122

{

123

NR::Matrix const local(sp_item_i2doc_affine(SP_ITEM(o)));

124

double const ex(NR::expansion(local));

123

Geom::Matrix const local(sp_item_i2doc_affine(SP_ITEM(o)));

124

double const ex(local.descrim());

125

125

if ( ( ex != 0. )

126

126

&& ( ex != 1. ) ) {

127

127

sp_css_attr_scale(css_set, 1/ex);

405

405

if (!SP_IS_ITEM (l->data))

406

406

continue;

407

407

408

NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(l->data));

408

Geom::Matrix i2d = sp_item_i2d_affine (SP_ITEM(l->data));

409

409

410

410

SPObject *object = SP_OBJECT(l->data);

411

411

416

416

notstroked = false;

417

417

}

418

418

419

avgwidth += SP_OBJECT_STYLE (object)->stroke_width.computed * NR::expansion(i2d);

419

avgwidth += SP_OBJECT_STYLE (object)->stroke_width.computed * i2d.descrim();

420

420

}

421

421

422

422

if (notstroked)

671

671

672

672

n_stroked ++;

673

673

674

NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj));

675

double sw = style->stroke_width.computed * NR::expansion(i2d);

674

Geom::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj));

675

double sw = style->stroke_width.computed * i2d.descrim();

676

676

677

677

if (prev_sw != -1 && fabs(sw - prev_sw) > 1e-3)

678

678

same_sw = false;

887

887

if (!style) continue;

888

888

889

889

texts ++;

890

size += style->font_size.computed * NR::expansion(sp_item_i2d_affine(SP_ITEM(obj))); /// \todo FIXME: we assume non-% units here

890

size += style->font_size.computed * Geom::Matrix(sp_item_i2d_affine(SP_ITEM(obj))).descrim(); /// \todo FIXME: we assume non-% units here

891

891

892

892

if (style->letter_spacing.normal) {

893

893

if (!different && (letterspacing_prev == 0 || letterspacing_prev == letterspacing))

1222

1222

if (!style) continue;

1223

1223

if (!SP_IS_ITEM(obj)) continue;

1224

1224

1225

NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj));

1225

Geom::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj));

1226

1226

1227

1227

items ++;

1228

1228

1238

1238

if(SP_IS_GAUSSIANBLUR(primitive)) {

1239

1239

SPGaussianBlur * spblur = SP_GAUSSIANBLUR(primitive);

1240

1240

float num = spblur->stdDeviation.getNumber();

1241

blur_sum += num * NR::expansion(i2d);

1241

blur_sum += num * i2d.descrim();

1242

1242

if (blur_prev != -1 && fabs (num - blur_prev) > 1e-2) // rather low tolerance because difference in blur radii is much harder to notice than e.g. difference in sizes

1243

1243

same_blur = false;

1244

1244

blur_prev = num;

Older »