index d829af6bf6ff3d84df469e6004f4dd0d405747fb..fc5c1af446593c0db42626003aab45e8d9ec11bc 100644 (file)
--- a/src/gradient-context.cpp
+++ b/src/gradient-context.cpp
#include "message-stack.h"
#include "pixmaps/cursor-gradient.xpm"
#include "pixmaps/cursor-gradient-add.xpm"
-#include "pixmaps/cursor-gradient-delete.xpm"
#include "gradient-context.h"
#include "gradient-chemistry.h"
#include <glibmm/i18n.h>
-#include "prefs-utils.h"
+#include "preferences.h"
#include "gradient-drag.h"
#include "gradient-chemistry.h"
#include "xml/repr.h"
static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event);
-static void sp_gradient_drag(SPGradientContext &rc, NR::Point const pt, guint state, guint32 etime);
+static void sp_gradient_drag(SPGradientContext &rc, Geom::Point const pt, guint state, guint32 etime);
static SPEventContextClass *parent_class;
N_("Radial gradient <b>mid stop</b>")
};
-static void
+static void
gradient_selection_changed (Inkscape::Selection *, gpointer data)
{
SPGradientContext *rc = (SPGradientContext *) data;
GrDrag *drag = rc->_grdrag;
Inkscape::Selection *selection = sp_desktop_selection(SP_EVENT_CONTEXT(rc)->desktop);
+ if (selection == NULL) {
+ return;
+ }
guint n_obj = g_slist_length((GSList *) selection->itemList());
if (!drag->isNonEmpty() || selection->isEmpty())
guint n_tot = drag->numDraggers();
guint n_sel = drag->numSelected();
+ //The use of ngettext in the following code is intentional even if the English singular form would never be used
if (n_sel == 1) {
if (drag->singleSelectedDraggerNumDraggables() == 1) {
- rc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
- _("%s selected out of %d gradient handles on %d selected object(s)"), gr_handle_descr[drag->singleSelectedDraggerSingleDraggableType()], n_tot, n_obj);
+ gchar * message = g_strconcat(
+ //TRANSLATORS: %s will be substituted with the point name (see previous messages); This is part of a compound message
+ _("%s selected"),
+ //TRANSLATORS: Mind the space in front. This is part of a compound message
+ ngettext(" out of %d gradient handle"," out of %d gradient handles",n_tot),
+ ngettext(" on %d selected object"," on %d selected objects",n_obj),NULL);
+ rc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
+ message,_(gr_handle_descr[drag->singleSelectedDraggerSingleDraggableType()]), n_tot, n_obj);
} else {
- rc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
- _("One handle merging %d stops (drag with <b>Shift</b> to separate) selected out of %d gradient handles on %d selected object(s)"), drag->singleSelectedDraggerNumDraggables(), n_tot, n_obj);
+ gchar * message = g_strconcat(
+ //TRANSLATORS: This is a part of a compound message (out of two more indicating: grandint handle count & object count)
+ ngettext("One handle merging %d stop (drag with <b>Shift</b> to separate) selected",
+ "One handle merging %d stops (drag with <b>Shift</b> to separate) selected",drag->singleSelectedDraggerNumDraggables()),
+ ngettext(" out of %d gradient handle"," out of %d gradient handles",n_tot),
+ ngettext(" on %d selected object"," on %d selected objects",n_obj),NULL);
+ rc->_message_context->setF(Inkscape::NORMAL_MESSAGE,message,drag->singleSelectedDraggerNumDraggables(), n_tot, n_obj);
}
} else if (n_sel > 1) {
- rc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
- _("<b>%d</b> gradient handles selected out of %d on %d selected object(s)"), n_sel, n_tot, n_obj);
+ //TRANSLATORS: The plural refers to number of selected gradient handles. This is part of a compound message (part two indicates selected object count)
+ gchar * message = g_strconcat(ngettext("<b>%d</b> gradient handle selected out of %d","<b>%d</b> gradient handles selected out of %d",n_sel),
+ //TRANSLATORS: Mind the space in front. (Refers to gradient handles selected). This is part of a compound message
+ ngettext(" on %d selected object"," on %d selected objects",n_obj),NULL);
+ rc->_message_context->setF(Inkscape::NORMAL_MESSAGE,message, n_sel, n_tot, n_obj);
} else if (n_sel == 0) {
rc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
- _("<b>No</b> gradient handles selected out of %d on %d selected object(s)"), n_tot, n_obj);
+ //TRANSLATORS: The plural refers to number of selected objects
+ ngettext("<b>No</b> gradient handles selected out of %d on %d selected object",
+ "<b>No</b> gradient handles selected out of %d on %d selected objects",n_obj), n_tot, n_obj);
}
}
((SPEventContextClass *) parent_class)->setup(ec);
}
- if (prefs_get_int_attribute("tools.gradient", "selcue", 1) != 0) {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ if (prefs->getBool("/tools/gradient/selcue", true)) {
ec->enableSelectionCue();
}
GrDragger *d = drag->select_next();
- event_context->desktop->scroll_to_point(&(d->point), 1.0);
+ event_context->desktop->scroll_to_point(d->point, 1.0);
}
void
GrDragger *d = drag->select_prev();
- event_context->desktop->scroll_to_point(&(d->point), 1.0);
-}
-
-// FIXME: make global function in libnr or somewhere.
-static NR::Point
-snap_vector_midpoint (NR::Point p, NR::Point begin, NR::Point end)
-{
- double length = NR::L2(end - begin);
- NR::Point be = (end - begin) / length;
- double r = NR::dot(p - begin, be);
-
- if (r < 0.0) return begin;
- if (r > length) return end;
-
- return (begin + r * be);
+ event_context->desktop->scroll_to_point(d->point, 1.0);
}
static bool
-sp_gradient_context_is_over_line (SPGradientContext *rc, SPItem *item, NR::Point event_p)
+sp_gradient_context_is_over_line (SPGradientContext *rc, SPItem *item, Geom::Point event_p)
{
SPDesktop *desktop = SP_EVENT_CONTEXT (rc)->desktop;
@@ -247,8 +253,8 @@ sp_gradient_context_is_over_line (SPGradientContext *rc, SPItem *item, NR::Point
SPCtrlLine* line = SP_CTRLLINE(item);
- NR::Point nearest = snap_vector_midpoint (rc->mousepoint_doc, line->s, line->e);
- double dist_screen = NR::L2 (rc->mousepoint_doc - nearest) * desktop->current_zoom();
+ Geom::Point nearest = snap_vector_midpoint (rc->mousepoint_doc, line->s, line->e, 0);
+ double dist_screen = Geom::L2 (rc->mousepoint_doc - nearest) * desktop->current_zoom();
double tolerance = (double) SP_EVENT_CONTEXT(rc)->tolerance;
@@ -257,23 +263,10 @@ sp_gradient_context_is_over_line (SPGradientContext *rc, SPItem *item, NR::Point
return close;
}
-static double
-get_offset_between_points (NR::Point p, NR::Point begin, NR::Point end)
-{
- double length = NR::L2(end - begin);
- NR::Point be = (end - begin) / length;
- double r = NR::dot(p - begin, be);
-
- if (r < 0.0) return 0.0;
- if (r > length) return 1.0;
-
- return (r / length);
-}
-
-std::vector<NR::Point>
+std::vector<Geom::Point>
sp_gradient_context_get_stop_intervals (GrDrag *drag, GSList **these_stops, GSList **next_stops)
{
- std::vector<NR::Point> coords;
+ std::vector<Geom::Point> coords;
// for all selected draggers
for (GList *i = drag->selected; i != NULL; i = i->next) {
@@ -281,7 +274,7 @@ sp_gradient_context_get_stop_intervals (GrDrag *drag, GSList **these_stops, GSLi
// remember the coord of the dragger to reselect it later
coords.push_back(dragger->point);
// for all draggables of dragger
- for (GSList const* j = dragger->draggables; j != NULL; j = j->next) {
+ for (GSList const* j = dragger->draggables; j != NULL; j = j->next) {
GrDraggable *d = (GrDraggable *) j->data;
// find the gradient
@@ -289,9 +282,9 @@ sp_gradient_context_get_stop_intervals (GrDrag *drag, GSList **these_stops, GSLi
SPGradient *vector = sp_gradient_get_forked_vector_if_necessary (gradient, false);
// these draggable types cannot have a next draggabe to insert a stop between them
- if (d->point_type == POINT_LG_END ||
- d->point_type == POINT_RG_FOCUS ||
- d->point_type == POINT_RG_R1 ||
+ if (d->point_type == POINT_LG_END ||
+ d->point_type == POINT_RG_FOCUS ||
+ d->point_type == POINT_RG_R1 ||
d->point_type == POINT_RG_R2) {
continue;
}
@@ -309,7 +302,7 @@ sp_gradient_context_get_stop_intervals (GrDrag *drag, GSList **these_stops, GSLi
// if there's a next stop,
if (next_stop) {
GrDragger *dnext = NULL;
- // find its dragger
+ // find its dragger
// (complex because it may have different types, and because in radial,
// more than one dragger may correspond to a stop, so we must distinguish)
if (type == POINT_LG_BEGIN || type == POINT_LG_MID) {
@@ -321,23 +314,24 @@ sp_gradient_context_get_stop_intervals (GrDrag *drag, GSList **these_stops, GSLi
if (type == POINT_RG_CENTER || type == POINT_RG_MID1) {
if (next_stop == last_stop)
dnext = drag->getDraggerFor (item, POINT_RG_R1, p_i+1, fs);
- else
+ else
dnext = drag->getDraggerFor (item, POINT_RG_MID1, p_i+1, fs);
- }
- if ((type == POINT_RG_MID2) ||
+ }
+ if ((type == POINT_RG_MID2) ||
(type == POINT_RG_CENTER && dnext && !dnext->isSelected())) {
if (next_stop == last_stop)
dnext = drag->getDraggerFor (item, POINT_RG_R2, p_i+1, fs);
- else
+ else
dnext = drag->getDraggerFor (item, POINT_RG_MID2, p_i+1, fs);
}
}
- // remember the coords of the future dragger to select it
- coords.push_back(0.5*(dragger->point + dnext->point));
-
// if both adjacent draggers selected,
if (!g_slist_find(*these_stops, this_stop) && dnext && dnext->isSelected()) {
+
+ // remember the coords of the future dragger to select it
+ coords.push_back(0.5*(dragger->point + dnext->point));
+
// do not insert a stop now, it will confuse the loop;
// just remember the stops
*these_stops = g_slist_prepend (*these_stops, this_stop);
GSList *these_stops = NULL;
GSList *next_stops = NULL;
- std::vector<NR::Point> coords = sp_gradient_context_get_stop_intervals (drag, &these_stops, &next_stops);
+ std::vector<Geom::Point> coords = sp_gradient_context_get_stop_intervals (drag, &these_stops, &next_stops);
if (g_slist_length(these_stops) == 0 && drag->numSelected() == 1) {
// if a single stop is selected, add between that stop and the next one
GrDragger *dragger = (GrDragger *) drag->selected->data;
- for (GSList const* j = dragger->draggables; j != NULL; j = j->next) {
+ for (GSList const* j = dragger->draggables; j != NULL; j = j->next) {
GrDraggable *d = (GrDraggable *) j->data;
SPGradient *gradient = sp_item_gradient (d->item, d->fill_or_stroke);
SPGradient *vector = sp_gradient_get_forked_vector_if_necessary (gradient, false);
GSList *these_stops = NULL;
GSList *next_stops = NULL;
- std::vector<NR::Point> coords = sp_gradient_context_get_stop_intervals (drag, &these_stops, &next_stops);
+ std::vector<Geom::Point> coords = sp_gradient_context_get_stop_intervals (drag, &these_stops, &next_stops);
GSList *todel = NULL;
guint32 const c0 = sp_stop_get_rgba32(stop0);
guint32 const c2 = sp_stop_get_rgba32(stop2);
guint32 const c1r = sp_stop_get_rgba32(stop1);
- guint32 c1 = average_color (c0, c2,
+ guint32 c1 = average_color (c0, c2,
(stop1->offset - stop0->offset) / (stop2->offset - stop0->offset));
- double diff =
+ double diff =
sqr(SP_RGBA32_R_F(c1) - SP_RGBA32_R_F(c1r)) +
sqr(SP_RGBA32_G_F(c1) - SP_RGBA32_G_F(c1r)) +
sqr(SP_RGBA32_B_F(c1) - SP_RGBA32_B_F(c1r)) +
}
-
static void
-sp_gradient_context_add_stop_near_point (SPGradientContext *rc, SPItem *item, NR::Point mouse_p, guint32 etime)
+sp_gradient_context_add_stop_near_point (SPGradientContext *rc, SPItem *item, Geom::Point mouse_p, guint32 /*etime*/)
{
// item is the selected item. mouse_p the location in doc coordinates of where to add the stop
@@ -483,96 +476,12 @@ sp_gradient_context_add_stop_near_point (SPGradientContext *rc, SPItem *item, N
double tolerance = (double) ec->tolerance;
- gfloat offset; // type of SPStop.offset = gfloat
- SPGradient *gradient;
- bool fill_or_stroke = true;
- bool r1_knot = false;
-
- bool addknot = false;
- do {
- gradient = sp_item_gradient (item, fill_or_stroke);
- if (SP_IS_LINEARGRADIENT(gradient)) {
- NR::Point begin = sp_item_gradient_get_coords(item, POINT_LG_BEGIN, 0, fill_or_stroke);
- NR::Point end = sp_item_gradient_get_coords(item, POINT_LG_END, 0, fill_or_stroke);
-
- NR::Point nearest = snap_vector_midpoint (mouse_p, begin, end);
- double dist_screen = NR::L2 (mouse_p - nearest) * desktop->current_zoom();
- if ( dist_screen < tolerance ) {
- // add the knot
- offset = get_offset_between_points(nearest, begin, end);
- addknot = true;
- break; // break out of the while loop: add only one knot
- }
- } else if (SP_IS_RADIALGRADIENT(gradient)) {
- NR::Point begin = sp_item_gradient_get_coords(item, POINT_RG_CENTER, 0, fill_or_stroke);
- NR::Point end = sp_item_gradient_get_coords(item, POINT_RG_R1, 0, fill_or_stroke);
- NR::Point nearest = snap_vector_midpoint (mouse_p, begin, end);
- double dist_screen = NR::L2 (mouse_p - nearest) * desktop->current_zoom();
- if ( dist_screen < tolerance ) {
- offset = get_offset_between_points(nearest, begin, end);
- addknot = true;
- r1_knot = true;
- break; // break out of the while loop: add only one knot
- }
-
- end = sp_item_gradient_get_coords(item, POINT_RG_R2, 0, fill_or_stroke);
- nearest = snap_vector_midpoint (mouse_p, begin, end);
- dist_screen = NR::L2 (mouse_p - nearest) * desktop->current_zoom();
- if ( dist_screen < tolerance ) {
- offset = get_offset_between_points(nearest, begin, end);
- addknot = true;
- r1_knot = false;
- break; // break out of the while loop: add only one knot
- }
- }
- fill_or_stroke = !fill_or_stroke;
- } while (!fill_or_stroke && !addknot) ;
-
- if (addknot) {
- SPGradient *vector = sp_gradient_get_forked_vector_if_necessary (gradient, false);
- SPStop* prev_stop = sp_first_stop(vector);
- SPStop* next_stop = sp_next_stop(prev_stop);
- while ( (next_stop) && (next_stop->offset < offset) ) {
- prev_stop = next_stop;
- next_stop = sp_next_stop(next_stop);
- }
- if (!next_stop) {
- // logical error: the endstop should have offset 1 and should always be more than this offset here
- return;
- }
-
-
- SPStop *newstop = sp_vector_add_stop (vector, prev_stop, next_stop, offset);
-
- sp_document_done (SP_OBJECT_DOCUMENT (vector), SP_VERB_CONTEXT_GRADIENT,
- _("Add gradient stop"));
+ ec->get_drag()->addStopNearPoint (item, mouse_p, tolerance/desktop->current_zoom());
- ec->_grdrag->updateDraggers();
- sp_gradient_ensure_vector (gradient);
+ sp_document_done (sp_desktop_document (desktop), SP_VERB_CONTEXT_GRADIENT,
+ _("Add gradient stop"));
- if (vector->has_stops) {
- guint i = sp_number_of_stops_before_stop(vector, newstop);
-
- gradient = sp_item_gradient (item, fill_or_stroke);
- GrPointType pointtype = POINT_G_INVALID;
- if (SP_IS_LINEARGRADIENT(gradient)) {
- pointtype = POINT_LG_MID;
- } else if (SP_IS_RADIALGRADIENT(gradient)) {
- pointtype = r1_knot ? POINT_RG_MID1 : POINT_RG_MID2;
- }
- GrDragger *dragger = SP_EVENT_CONTEXT(rc)->_grdrag->getDraggerFor (item, pointtype, i, fill_or_stroke);
- if (dragger && (etime == 0) ) {
- ec->_grdrag->setSelected (dragger);
- } else {
- ec->_grdrag->grabKnot (item,
- pointtype,
- i,
- fill_or_stroke, 99999, 99999, etime);
- }
- ec->_grdrag->local_change = true;
-
- }
- }
+ ec->get_drag()->updateDraggers();
}
@@ -583,11 +492,12 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
SPDesktop *desktop = event_context->desktop;
Inkscape::Selection *selection = sp_desktop_selection (desktop);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
SPGradientContext *rc = SP_GRADIENT_CONTEXT(event_context);
- event_context->tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
- double const nudge = prefs_get_double_attribute_limited("options.nudgedistance", "value", 2, 0, 1000); // in px
+ event_context->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
+ double const nudge = prefs->getDoubleLimited("/options/nudgedistance/value", 2, 0, 1000); // in px
GrDrag *drag = event_context->_grdrag;
g_assert (drag);
@@ -601,16 +511,18 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
if (drag->lines) {
for (GSList *l = drag->lines; (l != NULL) && (!over_line); l = l->next) {
line = (SPCtrlLine*) l->data;
- over_line |= sp_gradient_context_is_over_line (rc, (SPItem*) line, NR::Point(event->motion.x, event->motion.y));
+ over_line |= sp_gradient_context_is_over_line (rc, (SPItem*) line, Geom::Point(event->motion.x, event->motion.y));
}
}
if (over_line) {
+ // we take the first item in selection, because with doubleclick, the first click
+ // always resets selection to the single object under cursor
sp_gradient_context_add_stop_near_point(rc, SP_ITEM(selection->itemList()->data), rc->mousepoint_doc, event->button.time);
} else {
for (GSList const* i = selection->itemList(); i != NULL; i = i->next) {
SPItem *item = SP_ITEM(i->data);
- SPGradientType new_type = (SPGradientType) prefs_get_int_attribute ("tools.gradient", "newgradient", SP_GRADIENT_TYPE_LINEAR);
- guint new_fill = prefs_get_int_attribute ("tools.gradient", "newfillorstroke", 1);
+ SPGradientType new_type = (SPGradientType) prefs->getInt("/tools/gradient/newgradient", SP_GRADIENT_TYPE_LINEAR);
+ guint new_fill = prefs->getInt("/tools/gradient/newfillorstroke", 1);
SPGradient *vector = sp_gradient_vector_for_object(sp_desktop_document(desktop), desktop, SP_OBJECT (item), new_fill);
@@ -626,27 +538,28 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
break;
case GDK_BUTTON_PRESS:
if ( event->button.button == 1 && !event_context->space_panning ) {
- NR::Point const button_w(event->button.x, event->button.y);
+ Geom::Point button_w(event->button.x, event->button.y);
// save drag origin
- event_context->xp = (gint) button_w[NR::X];
- event_context->yp = (gint) button_w[NR::Y];
+ event_context->xp = (gint) button_w[Geom::X];
+ event_context->yp = (gint) button_w[Geom::Y];
event_context->within_tolerance = true;
dragging = true;
- NR::Point const button_dt = desktop->w2d(button_w);
+ Geom::Point button_dt = to_2geom(desktop->w2d(button_w));
if (event->button.state & GDK_SHIFT_MASK) {
- Inkscape::Rubberband::get()->start(desktop, button_dt);
+ Inkscape::Rubberband::get(desktop)->start(desktop, from_2geom(button_dt));
} else {
// remember clicked item, disregarding groups, honoring Alt; do nothing with Crtl to
// enable Ctrl+doubleclick of exactly the selected item(s)
if (!(event->button.state & GDK_CONTROL_MASK))
event_context->item_to_select = sp_event_context_find_item (desktop, button_w, event->button.state & GDK_MOD1_MASK, TRUE);
- /* Snap center to nearest magnetic point */
- SnapManager const &m = desktop->namedview->snap_manager;
- rc->origin = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, button_dt, NULL).getPoint();
+ SnapManager &m = desktop->namedview->snap_manager;
+ m.setup(desktop);
+ m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, button_dt, Inkscape::SNAPSOURCE_HANDLE);
+ rc->origin = from_2geom(button_dt);
}
ret = TRUE;
@@ -666,12 +579,12 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
// motion notify coordinates as given (no snapping back to origin)
event_context->within_tolerance = false;
- NR::Point const motion_w(event->motion.x,
+ Geom::Point const motion_w(event->motion.x,
event->motion.y);
- NR::Point const motion_dt = event_context->desktop->w2d(motion_w);
+ Geom::Point const motion_dt = event_context->desktop->w2d(motion_w);
- if (Inkscape::Rubberband::get()->is_started()) {
- Inkscape::Rubberband::get()->move(motion_dt);
+ if (Inkscape::Rubberband::get(desktop)->is_started()) {
+ Inkscape::Rubberband::get(desktop)->move(motion_dt);
event_context->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Draw around</b> handles to select them"));
} else {
sp_gradient_drag(*rc, motion_dt, event->motion.state, event->motion.time);
@@ -683,7 +596,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
bool over_line = false;
if (drag->lines) {
for (GSList *l = drag->lines; l != NULL; l = l->next) {
- over_line |= sp_gradient_context_is_over_line (rc, (SPItem*) l->data, NR::Point(event->motion.x, event->motion.y));
+ over_line |= sp_gradient_context_is_over_line (rc, (SPItem*) l->data, Geom::Point(event->motion.x, event->motion.y));
}
}
@@ -707,17 +620,19 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
if (drag->lines) {
for (GSList *l = drag->lines; (l != NULL) && (!over_line); l = l->next) {
line = (SPCtrlLine*) l->data;
- over_line |= sp_gradient_context_is_over_line (rc, (SPItem*) line, NR::Point(event->motion.x, event->motion.y));
+ over_line = sp_gradient_context_is_over_line (rc, (SPItem*) line, Geom::Point(event->motion.x, event->motion.y));
+ if (over_line)
+ break;
}
}
- if (over_line) {
- sp_gradient_context_add_stop_near_point(rc, SP_ITEM(selection->itemList()->data), rc->mousepoint_doc, 0);
+ if (over_line && line) {
+ sp_gradient_context_add_stop_near_point(rc, line->item, rc->mousepoint_doc, 0);
ret = TRUE;
}
} else {
dragging = false;
- // unless clicked with Ctrl (to enable Ctrl+doubleclick).
+ // unless clicked with Ctrl (to enable Ctrl+doubleclick).
if (event->button.state & GDK_CONTROL_MASK) {
ret = TRUE;
break;
@@ -726,11 +641,11 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
if (!event_context->within_tolerance) {
// we've been dragging, either do nothing (grdrag handles that),
// or rubberband-select if we have rubberband
- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get();
+ Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
if (r->is_started() && !event_context->within_tolerance) {
// this was a rubberband drag
if (r->getMode() == RUBBERBAND_MODE_RECT) {
- NR::Maybe<NR::Rect> const b = r->getRectangle();
+ Geom::OptRect const b = r->getRectangle();
drag->selectRect(*b);
}
}
@@ -754,7 +669,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
event_context->item_to_select = NULL;
ret = TRUE;
}
- Inkscape::Rubberband::get()->stop();
+ Inkscape::Rubberband::get(desktop)->stop();
}
break;
case GDK_KEY_PRESS:
@@ -811,13 +726,15 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KP_Left:
case GDK_KP_4:
if (!MOD__CTRL) { // not ctrl
+ gint mul = 1 + gobble_key_events(
+ get_group0_keyval(&event->key), 0); // with any mask
if (MOD__ALT) { // alt
- if (MOD__SHIFT) drag->selected_move_screen(-10, 0); // shift
- else drag->selected_move_screen(-1, 0); // no shift
+ if (MOD__SHIFT) drag->selected_move_screen(mul*-10, 0); // shift
+ else drag->selected_move_screen(mul*-1, 0); // no shift
}
else { // no alt
- if (MOD__SHIFT) drag->selected_move(-10*nudge, 0); // shift
- else drag->selected_move(-nudge, 0); // no shift
+ if (MOD__SHIFT) drag->selected_move(mul*-10*nudge, 0); // shift
+ else drag->selected_move(mul*-nudge, 0); // no shift
}
ret = TRUE;
}
@@ -826,13 +743,15 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KP_Up:
case GDK_KP_8:
if (!MOD__CTRL) { // not ctrl
+ gint mul = 1 + gobble_key_events(
+ get_group0_keyval(&event->key), 0); // with any mask
if (MOD__ALT) { // alt
- if (MOD__SHIFT) drag->selected_move_screen(0, 10); // shift
- else drag->selected_move_screen(0, 1); // no shift
+ if (MOD__SHIFT) drag->selected_move_screen(0, mul*10); // shift
+ else drag->selected_move_screen(0, mul*1); // no shift
}
else { // no alt
- if (MOD__SHIFT) drag->selected_move(0, 10*nudge); // shift
- else drag->selected_move(0, nudge); // no shift
+ if (MOD__SHIFT) drag->selected_move(0, mul*10*nudge); // shift
+ else drag->selected_move(0, mul*nudge); // no shift
}
ret = TRUE;
}
@@ -841,13 +760,15 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KP_Right:
case GDK_KP_6:
if (!MOD__CTRL) { // not ctrl
+ gint mul = 1 + gobble_key_events(
+ get_group0_keyval(&event->key), 0); // with any mask
if (MOD__ALT) { // alt
- if (MOD__SHIFT) drag->selected_move_screen(10, 0); // shift
- else drag->selected_move_screen(1, 0); // no shift
+ if (MOD__SHIFT) drag->selected_move_screen(mul*10, 0); // shift
+ else drag->selected_move_screen(mul*1, 0); // no shift
}
else { // no alt
- if (MOD__SHIFT) drag->selected_move(10*nudge, 0); // shift
- else drag->selected_move(nudge, 0); // no shift
+ if (MOD__SHIFT) drag->selected_move(mul*10*nudge, 0); // shift
+ else drag->selected_move(mul*nudge, 0); // no shift
}
ret = TRUE;
}
@@ -856,13 +777,15 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
case GDK_KP_Down:
case GDK_KP_2:
if (!MOD__CTRL) { // not ctrl
+ gint mul = 1 + gobble_key_events(
+ get_group0_keyval(&event->key), 0); // with any mask
if (MOD__ALT) { // alt
- if (MOD__SHIFT) drag->selected_move_screen(0, -10); // shift
- else drag->selected_move_screen(0, -1); // no shift
+ if (MOD__SHIFT) drag->selected_move_screen(0, mul*-10); // shift
+ else drag->selected_move_screen(0, mul*-1); // no shift
}
else { // no alt
- if (MOD__SHIFT) drag->selected_move(0, -10*nudge); // shift
- else drag->selected_move(0, -nudge); // no shift
+ if (MOD__SHIFT) drag->selected_move(0, mul*-10*nudge); // shift
+ else drag->selected_move(0, mul*-nudge); // no shift
}
ret = TRUE;
}
@@ -934,7 +857,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
return ret;
}
-static void sp_gradient_drag(SPGradientContext &rc, NR::Point const pt, guint state, guint32 etime)
+static void sp_gradient_drag(SPGradientContext &rc, Geom::Point const pt, guint /*state*/, guint32 etime)
{
SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop;
Inkscape::Selection *selection = sp_desktop_selection(desktop);
@@ -942,14 +865,22 @@ static void sp_gradient_drag(SPGradientContext &rc, NR::Point const pt, guint st
SPEventContext *ec = SP_EVENT_CONTEXT(&rc);
if (!selection->isEmpty()) {
- int type = prefs_get_int_attribute ("tools.gradient", "newgradient", 1);
- int fill_or_stroke = prefs_get_int_attribute ("tools.gradient", "newfillorstroke", 1);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ int type = prefs->getInt("/tools/gradient/newgradient", 1);
+ int fill_or_stroke = prefs->getInt("/tools/gradient/newfillorstroke", 1);
SPGradient *vector;
if (ec->item_to_select) {
+ // pick color from the object where drag started
vector = sp_gradient_vector_for_object(document, desktop, ec->item_to_select, fill_or_stroke);
} else {
- vector = sp_gradient_vector_for_object(document, desktop, SP_ITEM(selection->itemList()->data), fill_or_stroke);
+ // Starting from empty space:
+ // Sort items so that the topmost comes last
+ GSList *items = g_slist_copy ((GSList *) selection->itemList());
+ items = g_slist_sort(items, (GCompareFunc) sp_item_repr_compare_position);
+ // take topmost
+ vector = sp_gradient_vector_for_object(document, desktop, SP_ITEM(g_slist_last(items)->data), fill_or_stroke);
+ g_slist_free (items);
}
// HACK: reset fill-opacity - that 0.75 is annoying; BUT remove this when we have an opacity slider for all tabs