From f51227a487f3d80e096c04470a969f5efa911a98 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 30 Mar 2013 21:49:36 +0100 Subject: Turned all functions concerning SPRect into member functions. (bzr r11608.1.60) --- src/rect-context.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 040127ae3..40e1d5b2a 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -469,15 +469,17 @@ static void sp_rect_drag(SPRectContext &rc, Geom::Point const pt, guint state) Geom::Rect const r = Inkscape::snap_rectangular_box(desktop, rc.item, pt, rc.center, state); - sp_rect_position_set(SP_RECT(rc.item), r.min()[Geom::X], r.min()[Geom::Y], r.dimensions()[Geom::X], r.dimensions()[Geom::Y]); + SP_RECT(rc.item)->setPosition(r.min()[Geom::X], r.min()[Geom::Y], r.dimensions()[Geom::X], r.dimensions()[Geom::Y]); + if ( rc.rx != 0.0 ) { - sp_rect_set_rx (SP_RECT(rc.item), TRUE, rc.rx); + SP_RECT(rc.item)->setRx(true, rc.rx); } + if ( rc.ry != 0.0 ) { if (rc.rx == 0.0) - sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, MIN(r.dimensions()[Geom::X], r.dimensions()[Geom::Y])/2)); + SP_RECT(rc.item)->setRy(true, CLAMP(rc.ry, 0, MIN(r.dimensions()[Geom::X], r.dimensions()[Geom::Y])/2)); else - sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, r.dimensions()[Geom::Y])); + SP_RECT(rc.item)->setRy(true, CLAMP(rc.ry, 0, r.dimensions()[Geom::Y])); } // status text -- cgit v1.2.3