![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index e3e0fcf1a53c0838c6fbe5943f442c0ff6e0ca0e..5424b7a3d7289280e659e177749b48855ffbd68b 100644 (file)
--- a/src/gradient-context.cpp
+++ b/src/gradient-context.cpp
#include "svg/svg-color.h"
#include "snap.h"
#include "sp-namedview.h"
+#include "rubberband.h"
delete rc->_message_context;
}
+ rc->selcon->disconnect();
+ delete rc->selcon;
+ rc->subselcon->disconnect();
+ delete rc->subselcon;
+
G_OBJECT_CLASS(parent_class)->dispose(object);
}
+const gchar *gr_handle_descr [] = {
+ N_("Linear gradient <b>start</b>"), //POINT_LG_BEGIN
+ N_("Linear gradient <b>end</b>"),
+ N_("Linear gradient <b>mid stop</b>"),
+ N_("Radial gradient <b>center</b>"),
+ N_("Radial gradient <b>radius</b>"),
+ N_("Radial gradient <b>radius</b>"),
+ N_("Radial gradient <b>focus</b>"), // POINT_RG_FOCUS
+ N_("Radial gradient <b>mid stop</b>"),
+ N_("Radial gradient <b>mid stop</b>")
+};
+
+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);
+ guint n_obj = g_slist_length((GSList *) selection->itemList());
+
+ if (!drag->isNonEmpty() || selection->isEmpty())
+ return;
+ guint n_tot = drag->numDraggers();
+ guint n_sel = drag->numSelected();
+
+ 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);
+ } 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);
+ }
+ } 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);
+ } 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);
+ }
+}
+
+static void
+gradient_subselection_changed (gpointer, gpointer data)
+{
+ gradient_selection_changed (NULL, data);
+}
+
+
static void sp_gradient_context_setup(SPEventContext *ec)
{
SPGradientContext *rc = SP_GRADIENT_CONTEXT(ec);
}
ec->enableGrDrag();
+ Inkscape::Selection *selection = sp_desktop_selection(ec->desktop);
rc->_message_context = new Inkscape::MessageContext(sp_desktop_message_stack(ec->desktop));
+
+ rc->selcon = new sigc::connection (selection->connectChanged( sigc::bind (sigc::ptr_fun(&gradient_selection_changed), rc)));
+ rc->subselcon = new sigc::connection (ec->desktop->connectToolSubselectionChanged(sigc::bind (sigc::ptr_fun(&gradient_subselection_changed), rc)));
+ gradient_selection_changed(selection, rc);
}
void
GrDrag *drag = event_context->_grdrag;
g_assert (drag);
- drag->select_next();
+ GrDragger *d = drag->select_next();
+
+ event_context->desktop->scroll_to_point(&(d->point), 1.0);
}
void
GrDrag *drag = event_context->_grdrag;
g_assert (drag);
- drag->select_prev();
-}
+ GrDragger *d = drag->select_prev();
-// 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
@@ -182,7 +233,7 @@ 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);
+ NR::Point nearest = snap_vector_midpoint (rc->mousepoint_doc, line->s, line->e, 0);
double dist_screen = NR::L2 (rc->mousepoint_doc - nearest) * desktop->current_zoom();
double tolerance = (double) SP_EVENT_CONTEXT(rc)->tolerance;
@@ -192,19 +243,6 @@ 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>
sp_gradient_context_get_stop_intervals (GrDrag *drag, GSList **these_stops, GSList **next_stops)
{
@@ -268,11 +306,12 @@ sp_gradient_context_get_stop_intervals (GrDrag *drag, GSList **these_stops, GSLi
}
}
- // 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);
std::vector<NR::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) {
+ 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);
+ SPStop *this_stop = sp_get_stop_i (vector, d->point_i);
+ SPStop *next_stop = sp_next_stop (this_stop);
+ if (this_stop && next_stop) {
+ these_stops = g_slist_prepend (these_stops, this_stop);
+ next_stops = g_slist_prepend (next_stops, next_stop);
+ }
+ }
+ }
+
// now actually create the new stops
GSList *i = these_stops;
GSList *j = next_stops;
}
-
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, NR::Point mouse_p, guint32 /*etime*/)
{
// item is the selected item. mouse_p the location in doc coordinates of where to add the stop
@@ -402,96 +456,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->_grdrag->updateDraggers();
- sp_gradient_ensure_vector (gradient);
+ ec->get_drag()->addStopNearPoint (item, mouse_p, tolerance/desktop->current_zoom());
- if (vector->has_stops) {
- guint i = sp_number_of_stops_before_stop(vector, newstop);
+ sp_document_done (sp_desktop_document (desktop), SP_VERB_CONTEXT_GRADIENT,
+ _("Add gradient stop"));
- 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();
}
@@ -524,6 +494,8 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
}
}
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) {
@@ -552,18 +524,21 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
event_context->yp = (gint) button_w[NR::Y];
event_context->within_tolerance = true;
- // 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);
-
dragging = true;
- /* Position center */
+
NR::Point const button_dt = desktop->w2d(button_w);
- /* 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();
+ if (event->button.state & GDK_SHIFT_MASK) {
+ Inkscape::Rubberband::get()->start(desktop, 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();
+ }
ret = TRUE;
}
@@ -586,7 +561,13 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
event->motion.y);
NR::Point const motion_dt = event_context->desktop->w2d(motion_w);
- sp_gradient_drag(*rc, motion_dt, event->motion.state, event->motion.time);
+ if (Inkscape::Rubberband::get()->is_started()) {
+ Inkscape::Rubberband::get()->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);
+ }
+ gobble_motion_events(GDK_BUTTON1_MASK);
ret = TRUE;
} else {
@@ -617,24 +598,36 @@ 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, NR::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). (don't what this is for (johan))
+ // unless clicked with Ctrl (to enable Ctrl+doubleclick).
if (event->button.state & GDK_CONTROL_MASK) {
ret = TRUE;
break;
}
if (!event_context->within_tolerance) {
- // we've been dragging, do nothing (grdrag handles that)
+ // we've been dragging, either do nothing (grdrag handles that),
+ // or rubberband-select if we have rubberband
+ Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get();
+ 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();
+ drag->selectRect(*b);
+ }
+ }
+
} else if (event_context->item_to_select) {
// no dragging, select clicked item if any
if (event->button.state & GDK_SHIFT_MASK) {
@@ -654,6 +647,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
event_context->item_to_select = NULL;
ret = TRUE;
}
+ Inkscape::Rubberband::get()->stop();
}
break;
case GDK_KEY_PRESS:
@@ -833,7 +827,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, NR::Point const pt, guint /*state*/, guint32 etime)
{
SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop;
Inkscape::Selection *selection = sp_desktop_selection(desktop);