diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 74fc2fe67c6317cc4e5e484421d4957600edc455..5801489fe0db2114dd225072547bf570da634644 100644 (file)
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
#include "gradient-drag.h"
#include "sp-stop.h"
+#include "snap.h"
+#include "sp-namedview.h"
+
+
#define GR_KNOT_COLOR_NORMAL 0xffffff00
#define GR_KNOT_COLOR_SELECTED 0x0000ff00
@@ -429,19 +433,26 @@ gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpoi
}
}
-
if (!((state & GDK_SHIFT_MASK) || ((state & GDK_CONTROL_MASK) && (state & GDK_MOD1_MASK)))) {
- // See if we need to snap to any of the levels
- for (guint i = 0; i < dragger->parent->hor_levels.size(); i++) {
- if (fabs(p[NR::Y] - dragger->parent->hor_levels[i]) < snap_dist) {
- p[NR::Y] = dragger->parent->hor_levels[i];
- sp_knot_moveto (knot, &p);
+ // Try snapping to the grid or guides
+ SnapManager const &m = dragger->parent->desktop->namedview->snap_manager;
+ Inkscape::SnappedPoint s = m.freeSnap(Inkscape::Snapper::SNAP_POINT | Inkscape::Snapper::BBOX_POINT, p, NULL);
+ if (s.getDistance() < 1e6) {
+ p = s.getPoint();
+ sp_knot_moveto (knot, &p);
+ } else {
+ // No snapping so far, let's see if we need to snap to any of the levels
+ for (guint i = 0; i < dragger->parent->hor_levels.size(); i++) {
+ if (fabs(p[NR::Y] - dragger->parent->hor_levels[i]) < snap_dist) {
+ p[NR::Y] = dragger->parent->hor_levels[i];
+ sp_knot_moveto (knot, &p);
+ }
}
- }
- for (guint i = 0; i < dragger->parent->vert_levels.size(); i++) {
- if (fabs(p[NR::X] - dragger->parent->vert_levels[i]) < snap_dist) {
- p[NR::X] = dragger->parent->vert_levels[i];
- sp_knot_moveto (knot, &p);
+ for (guint i = 0; i < dragger->parent->vert_levels.size(); i++) {
+ if (fabs(p[NR::X] - dragger->parent->vert_levels[i]) < snap_dist) {
+ p[NR::X] = dragger->parent->vert_levels[i];
+ sp_knot_moveto (knot, &p);
+ }
}
}
}
@@ -791,7 +802,9 @@ GrDragger::fireDraggables (bool write_repr, bool scale_radial, bool merging_focu
// to the center, unless it's the first update upon merge when we must snap it to the point
if (merging_focus ||
!(draggable->point_type == POINT_RG_FOCUS && this->isA(draggable->item, POINT_RG_CENTER, draggable->point_i, draggable->fill_or_stroke)))
+ {
sp_item_gradient_set_coords (draggable->item, draggable->point_type, draggable->point_i, this->point, draggable->fill_or_stroke, write_repr, scale_radial);
+ }
}
}
for (GSList const* i = this->selection->itemList(); i != NULL; i = i->next) {
SPItem *item = SP_ITEM(i->data);
- NR::Rect rect = sp_item_bbox_desktop (item);
- // Remember the edges of the bbox and the center axis
- hor_levels.push_back(rect.min()[NR::Y]);
- hor_levels.push_back(rect.max()[NR::Y]);
- hor_levels.push_back(0.5 * (rect.min()[NR::Y] + rect.max()[NR::Y]));
- vert_levels.push_back(rect.min()[NR::X]);
- vert_levels.push_back(rect.max()[NR::X]);
- vert_levels.push_back(0.5 * (rect.min()[NR::X] + rect.max()[NR::X]));
+ NR::Maybe<NR::Rect> rect = sp_item_bbox_desktop (item);
+ if (rect) {
+ // Remember the edges of the bbox and the center axis
+ hor_levels.push_back(rect->min()[NR::Y]);
+ hor_levels.push_back(rect->max()[NR::Y]);
+ hor_levels.push_back(0.5 * (rect->min()[NR::Y] + rect->max()[NR::Y]));
+ vert_levels.push_back(rect->min()[NR::X]);
+ vert_levels.push_back(rect->max()[NR::X]);
+ vert_levels.push_back(0.5 * (rect->min()[NR::X] + rect->max()[NR::X]));
+ }
}
}
for (GSList * drgble = dragger->draggables; drgble != NULL; drgble = drgble->next) {
GrDraggable *draggable = (GrDraggable*) drgble->data;
SPGradient *gradient = sp_item_gradient (draggable->item, draggable->fill_or_stroke);
- SPGradient *vector = sp_gradient_get_vector (gradient, false);
+ SPGradient *vector = sp_gradient_get_forked_vector_if_necessary (gradient, false);
+
switch (draggable->point_type) {
case POINT_LG_MID:
case POINT_RG_MID1:
else
{ // delete the gradient from the object. set fill to unset FIXME: set to fill of unselected node?
SPCSSAttr *css = sp_repr_css_attr_new ();
- if (stopinfo->draggable->fill_or_stroke) {
- sp_repr_css_unset_property (css, "fill");
+
+ // stopinfo->spstop is the selected stop
+ Inkscape::XML::Node *unselectedrepr = SP_OBJECT_REPR(stopinfo->vector)->firstChild();
+ if (unselectedrepr == SP_OBJECT_REPR(stopinfo->spstop) ) {
+ unselectedrepr = unselectedrepr->next();
+ }
+
+ if (unselectedrepr == NULL) {
+ if (stopinfo->draggable->fill_or_stroke) {
+ sp_repr_css_unset_property (css, "fill");
+ } else {
+ sp_repr_css_unset_property (css, "stroke");
+ }
} else {
- sp_repr_css_unset_property (css, "stroke");
+ SPCSSAttr *stopcss = sp_repr_css_attr(unselectedrepr, "style");
+ if (stopinfo->draggable->fill_or_stroke) {
+ sp_repr_css_set_property(css, "fill", sp_repr_css_property(stopcss, "stop-color", "inkscape:unset"));
+ sp_repr_css_set_property(css, "fill-opacity", sp_repr_css_property(stopcss, "stop-opacity", "1"));
+ } else {
+ sp_repr_css_set_property(css, "stroke", sp_repr_css_property(stopcss, "stop-color", "inkscape:unset"));
+ sp_repr_css_set_property(css, "stroke-opacity", sp_repr_css_property(stopcss, "stop-opacity", "1"));
+ }
+ sp_repr_css_attr_unref (stopcss);
}
+
sp_repr_css_change (SP_OBJECT_REPR (stopinfo->draggable->item), css, "style");
sp_repr_css_attr_unref (css);
}