~centralelyon2010/inkscape/imagelinks2

« back to all changes in this revision

Viewing changes to src/sp-flowtext.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/sp-flowtext.cpp

static void sp_flowtext_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);

static void sp_flowtext_set(SPObject *object, unsigned key, gchar const *value);

static void sp_flowtext_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const flags);

static void sp_flowtext_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const flags);

static void sp_flowtext_print(SPItem *item, SPPrintContext *ctx);

static gchar *sp_flowtext_description(SPItem *item);

static NRArenaItem *sp_flowtext_show(SPItem *item, NRArena *arena, unsigned key, unsigned flags);

176

group->rebuildLayout();

177

178

NRRect paintbox;

179

sp_item_invoke_bbox(group, &paintbox, NR::identity(), TRUE);

179

sp_item_invoke_bbox(group, &paintbox, Geom::identity(), TRUE);

180

for (SPItemView *v = group->display; v != NULL; v = v->next) {

181

group->_clearFlow(NR_ARENA_GROUP(v->arenaitem));

182

nr_arena_group_set_style(NR_ARENA_GROUP(v->arenaitem), SP_OBJECT_STYLE(object));

198

if (flags & ( SP_OBJECT_STYLE_MODIFIED_FLAG )) {

199

SPFlowtext *text = SP_FLOWTEXT(object);

200

NRRect paintbox;

201

sp_item_invoke_bbox(text, &paintbox, NR::identity(), TRUE);

201

sp_item_invoke_bbox(text, &paintbox, Geom::identity(), TRUE);

202

for (SPItemView* v = text->display; v != NULL; v = v->next) {

203

text->_clearFlow(NR_ARENA_GROUP(v->arenaitem));

204

nr_arena_group_set_style(NR_ARENA_GROUP(v->arenaitem), SP_OBJECT_STYLE(object));

323

}

324

325

static void

326

sp_flowtext_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const /*flags*/)

326

sp_flowtext_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const /*flags*/)

327

{

328

SPFlowtext *group = SP_FLOWTEXT(item);

329

group->layout.getBoundingBox(bbox, transform);

331

// Add stroke width

332

SPStyle* style=SP_OBJECT_STYLE (item);

333

if ( !style->stroke.isNone() ) {

334

double const scale = expansion(transform);

334

double const scale = transform.descrim();

335

if ( fabs(style->stroke_width.computed * scale) > 0.01 ) { // sinon c'est 0=oon veut pas de bord

336

double const width = MAX(0.125, style->stroke_width.computed * scale);

337

if ( fabs(bbox->x1 - bbox->x0) > -0.00001 && fabs(bbox->y1 - bbox->y0) > -0.00001 ) {

350

SPFlowtext *group = SP_FLOWTEXT(item);

351

352

NRRect pbox;

353

sp_item_invoke_bbox(item, &pbox, NR::identity(), TRUE);

353

sp_item_invoke_bbox(item, &pbox, Geom::identity(), TRUE);

354

NRRect bbox;

355

boost::optional<NR::Rect> bbox_maybe = sp_item_bbox_desktop(item);

356

if (!bbox_maybe) {

390

391

// pass the bbox of the flowtext object as paintbox (used for paintserver fills)

392

NRRect paintbox;

393

sp_item_invoke_bbox(item, &paintbox, NR::identity(), TRUE);

393

sp_item_invoke_bbox(item, &paintbox, Geom::identity(), TRUE);

394

group->layout.show(flowed, &paintbox);

395

396

return flowed;

556

// set x,y attributes only when we need to

557

bool set_x = false;

558

bool set_y = false;

559

if (!item->transform.test_identity()) {

559

if (!item->transform.isIdentity()) {

560

set_x = set_y = true;

561

} else {

562

Inkscape::Text::Layout::iterator it_chunk_start = it;

Older »