diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-10-13 19:40:31 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-10-13 19:40:31 +0000 |
| commit | 34789891fcdbd099bd390ce3d0465dee24a788db (patch) | |
| tree | 1b16d78374f9d56c0f03a6b20c9e2e6048f4fb5e /src/arc-context.cpp | |
| parent | update to trunk (diff) | |
| parent | UI message generalisation (diff) | |
| download | inkscape-34789891fcdbd099bd390ce3d0465dee24a788db.tar.gz inkscape-34789891fcdbd099bd390ce3d0465dee24a788db.zip | |
Update to trunk
(bzr r12588.1.12)
Diffstat (limited to 'src/arc-context.cpp')
| -rw-r--r-- | src/arc-context.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 046541b9b..a14562a32 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -363,7 +363,7 @@ void SPArcContext::drag(Geom::Point pt, guint state) { // Set style sp_desktop_apply_style_tool(desktop, repr, "/tools/shapes/arc", false); - this->arc = SP_ARC(desktop->currentLayer()->appendChildRepr(repr)); + this->arc = SP_GENERICELLIPSE(desktop->currentLayer()->appendChildRepr(repr)); Inkscape::GC::release(repr); this->arc->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); this->arc->updateRepr(); @@ -409,17 +409,17 @@ void SPArcContext::drag(Geom::Point pt, guint state) { } } - this->arc->sp_arc_position_set( - r.midpoint()[Geom::X], r.midpoint()[Geom::Y], - r.dimensions()[Geom::X] / 2, r.dimensions()[Geom::Y] / 2); + this->arc->position_set( + r.midpoint()[Geom::X], r.midpoint()[Geom::Y], + r.dimensions()[Geom::X] / 2, r.dimensions()[Geom::Y] / 2); double rdimx = r.dimensions()[Geom::X]; double rdimy = r.dimensions()[Geom::Y]; Inkscape::Util::Quantity rdimx_q = Inkscape::Util::Quantity(rdimx, "px"); Inkscape::Util::Quantity rdimy_q = Inkscape::Util::Quantity(rdimy, "px"); - GString *xs = g_string_new(rdimx_q.string(*desktop->namedview->doc_units).c_str()); - GString *ys = g_string_new(rdimy_q.string(*desktop->namedview->doc_units).c_str()); + GString *xs = g_string_new(rdimx_q.string(desktop->namedview->doc_units).c_str()); + GString *ys = g_string_new(rdimy_q.string(desktop->namedview->doc_units).c_str()); if (state & GDK_CONTROL_MASK) { int ratio_x, ratio_y; |