~centralelyon2010/inkscape/imagelinks2

« back to all changes in this revision

Viewing changes to src/interface.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

Show diffs side-by-side

added added

removed removed

Lines of Context:
201
201
                if (x>0 && y>0) {
202
202
                    SPDesktop *active_desktop = SP_ACTIVE_DESKTOP;
203
203
                    if (active_desktop == desktop || active_desktop==NULL) {
204
 
                        desktop->setWindowPosition(NR::Point(x, y));
 
204
                        desktop->setWindowPosition(Geom::Point(x, y));
205
205
                    }
206
206
                }
207
207
            }
1062
1062
            int destX = 0;
1063
1063
            int destY = 0;
1064
1064
            gtk_widget_translate_coordinates( widget, &(desktop->canvas->widget), x, y, &destX, &destY );
1065
 
            NR::Point where( sp_canvas_window_to_world( desktop->canvas, NR::Point( destX, destY ) ) );
 
1065
            Geom::Point where( sp_canvas_window_to_world( desktop->canvas, Geom::Point( destX, destY ) ) );
1066
1066
 
1067
1067
            SPItem *item = desktop->item_at_point( where, true );
1068
1068
            if ( item )
1189
1189
                                ( !SP_OBJECT_STYLE(item)->stroke.isNone() ?
1190
1190
                                  desktop->current_zoom() *
1191
1191
                                  SP_OBJECT_STYLE (item)->stroke_width.computed *
1192
 
                                  NR::expansion(sp_item_i2d_affine(item)) * 0.5
 
1192
                                  to_2geom(sp_item_i2d_affine(item)).descrim() * 0.5
1193
1193
                                  : 0.0)
1194
1194
                                + prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100); 
1195
1195