From 498629f82d9453cb7222ab642b867c183fdf1666 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Thu, 5 Aug 2010 01:56:47 +0200 Subject: Wholesale cruft removal part 3 (bzr r9508.1.47) --- src/star-context.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index 63a15545f..4e9e883ce 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -452,14 +452,14 @@ static void sp_star_drag(SPStarContext *sc, Geom::Point p, guint state) double const sides = (gdouble) sc->magnitude; Geom::Point const d = p1 - p0; Geom::Coord const r1 = Geom::L2(d); - double arg1 = atan2(from_2geom(d)); + double arg1 = atan2(d); if (state & GDK_CONTROL_MASK) { /* Snap angle */ arg1 = sp_round(arg1, M_PI / snaps); } - sp_star_position_set(star, sc->magnitude, from_2geom(p0), r1, r1 * sc->proportion, + sp_star_position_set(star, sc->magnitude, p0, r1, r1 * sc->proportion, arg1, arg1 + M_PI / sides, sc->isflatsided, sc->rounded, sc->randomized); /* status text */ -- cgit v1.2.3 From ab143333746e25648b253f13c0539adff089b1b6 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Fri, 24 Jun 2011 00:22:07 +0200 Subject: Remove more of libnr (bzr r10347.1.2) --- src/star-context.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index 9f4afb94c..bc0376a20 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -225,9 +225,9 @@ sp_star_context_set (SPEventContext *ec, Inkscape::Preferences::Entry *val) Glib::ustring path = val->getEntryName(); if (path == "magnitude") { - sc->magnitude = NR_CLAMP(val->getInt(5), 3, 1024); + sc->magnitude = CLAMP(val->getInt(5), 3, 1024); } else if (path == "proportion") { - sc->proportion = NR_CLAMP(val->getDouble(0.5), 0.01, 2.0); + sc->proportion = CLAMP(val->getDouble(0.5), 0.01, 2.0); } else if (path == "isflatsided") { sc->isflatsided = val->getBool(); } else if (path == "rounded") { @@ -446,7 +446,7 @@ static void sp_star_drag(SPStarContext *sc, Geom::Point p, guint state) /* Snap corner point with no constraints */ SnapManager &m = desktop->namedview->snap_manager; m.setup(desktop, true, sc->item); - Geom::Point pt2g = to_2geom(p); + Geom::Point pt2g = p; m.freeSnapReturnByRef(pt2g, Inkscape::SNAPSOURCE_NODE_HANDLE); m.unSetup(); Geom::Point const p0 = desktop->dt2doc(sc->center); -- cgit v1.2.3 From 4d8bf28dbebbc70325c75c0501ed192ae330c63b Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 24 Jun 2011 11:23:41 +0100 Subject: Switch to GObject (bzr r10350.1.3) --- src/star-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index 9f4afb94c..17a8e915f 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -64,7 +64,7 @@ static void sp_star_cancel(SPStarContext * sc); static SPEventContextClass * parent_class; -GtkType +GType sp_star_context_get_type (void) { static GType type = 0; -- cgit v1.2.3 From d6af1140ee108cc7d7fb6e0ba89ff7e30bb7ad3a Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 27 Aug 2011 18:05:32 +0200 Subject: Completely remove NRRect, NRRectL, in-svg-plane.h (bzr r10582.1.6) --- src/star-context.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index 878ecfbe7..c954fd7d7 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -34,7 +34,6 @@ #include "desktop.h" #include "desktop-style.h" #include "message-context.h" -#include "libnr/nr-macros.h" #include "pixmaps/cursor-star.xpm" #include "sp-metrics.h" #include -- cgit v1.2.3 From 20097d47e6945bceb57d2335d23fe764f493ab59 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Sun, 2 Oct 2011 20:44:17 -0700 Subject: Another minor pass of Doxygen cleanup. (bzr r10659) --- src/star-context.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index c954fd7d7..352bdfece 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -163,12 +163,12 @@ sp_star_context_dispose (GObject *object) } /** -\brief Callback that processes the "changed" signal on the selection; -destroys old and creates new knotholder -\param selection Should not be NULL. -*/ -void -sp_star_context_selection_changed (Inkscape::Selection * selection, gpointer data) + * Callback that processes the "changed" signal on the selection; + * destroys old and creates new knotholder. + * + * @param selection Should not be NULL. + */ +void sp_star_context_selection_changed (Inkscape::Selection * selection, gpointer data) { g_assert (selection != NULL); -- cgit v1.2.3