![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index e4c7a62da43d49bab0378ca3eb30dfe455165952..5801489fe0db2114dd225072547bf570da634644 100644 (file)
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
*
* Authors:
* bulia byak <buliabyak@users.sf.net>
+ * Johan Engelen <j.b.c.engelen@ewi.utwente.nl>
*
+ * Copyright (C) 2007 Johan Engelen
* Copyright (C) 2005 Authors
*
* Released under GNU GPL, read the file 'COPYING' for more information
#include "display/sp-ctrlline.h"
#include "xml/repr.h"
+#include "svg/css-ostringstream.h"
+
+#include "svg/svg.h"
#include "prefs-utils.h"
#include "sp-item.h"
#include "sp-radial-gradient.h"
#include "gradient-chemistry.h"
#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
// absolute distance between gradient points for them to become a single dragger when the drag is created:
#define MERGE_DIST 0.1
-// knot shapes corresponding to GrPoint enum
+// knot shapes corresponding to GrPointType enum
SPKnotShapeType gr_knot_shapes [] = {
- SP_KNOT_SHAPE_SQUARE, //POINT_LG_P1
- SP_KNOT_SHAPE_SQUARE,
- SP_KNOT_SHAPE_DIAMOND,
- SP_KNOT_SHAPE_CIRCLE,
- SP_KNOT_SHAPE_CIRCLE,
- SP_KNOT_SHAPE_CROSS // POINT_RG_FOCUS
+ SP_KNOT_SHAPE_SQUARE, //POINT_LG_BEGIN
+ SP_KNOT_SHAPE_CIRCLE, //POINT_LG_END
+ SP_KNOT_SHAPE_DIAMOND, //POINT_LG_MID
+ SP_KNOT_SHAPE_SQUARE, // POINT_RG_CENTER
+ SP_KNOT_SHAPE_CIRCLE, // POINT_RG_R1
+ SP_KNOT_SHAPE_CIRCLE, // POINT_RG_R2
+ SP_KNOT_SHAPE_CROSS, // POINT_RG_FOCUS
+ SP_KNOT_SHAPE_DIAMOND, //POINT_RG_MID1
+ SP_KNOT_SHAPE_DIAMOND //POINT_RG_MID2
};
const gchar *gr_knot_descr [] = {
- N_("Linear gradient <b>start</b>"), //POINT_LG_P1
+ N_("Linear gradient <b>start</b>"), //POINT_LG_BEGIN
N_("Linear gradient <b>end</b>"),
+ N_("Linear gradient <b>midstop</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>focus</b>"), // POINT_RG_FOCUS
+ N_("Linear gradient <b>midstop</b>"),
+ N_("Linear gradient <b>midstop</b>")
};
static void
}
/**
-When a _query_style_signal is received, check that \a property requests fill/stroke (otherwise
+When a _query_style_signal is received, check that \a property requests fill/stroke/opacity (otherwise
skip), and fill the \a style with the averaged color of all draggables of the selected dragger, if
any.
*/
{
GrDrag *drag = (GrDrag *) data;
- if (property != QUERY_STYLE_PROPERTY_FILL && property != QUERY_STYLE_PROPERTY_STROKE) {
+ if (property != QUERY_STYLE_PROPERTY_FILL && property != QUERY_STYLE_PROPERTY_STROKE && property != QUERY_STYLE_PROPERTY_MASTEROPACITY) {
return QUERY_STYLE_NOTHING;
}
int count = 0;
- for (GSList const* i = drag->selected->draggables; i != NULL; i = i->next) { // for all draggables of dragger
+ for (GSList const* i = ((GrDragger*)drag->selected->data)->draggables; i != NULL; i = i->next) { // for all draggables of dragger
GrDraggable *draggable = (GrDraggable *) i->data;
if (ret == QUERY_STYLE_NOTHING) {
ret = QUERY_STYLE_MULTIPLE_AVERAGED;
}
- guint32 c = sp_item_gradient_stop_query_style (draggable->item, draggable->point_num, draggable->fill_or_stroke);
+ guint32 c = sp_item_gradient_stop_query_style (draggable->item, draggable->point_type, draggable->point_i, draggable->fill_or_stroke);
cf[0] += SP_RGBA32_R_F (c);
cf[1] += SP_RGBA32_G_F (c);
cf[2] += SP_RGBA32_B_F (c);
style->stroke.set = TRUE;
style->stroke.type = SP_PAINT_TYPE_COLOR;
- style->fill_opacity.value = SP_SCALE24_FROM_FLOAT (cf[3]);
+ style->fill_opacity.value = SP_SCALE24_FROM_FLOAT (1.0);
style->fill_opacity.set = TRUE;
- style->stroke_opacity.value = SP_SCALE24_FROM_FLOAT (cf[3]);
+ style->stroke_opacity.value = SP_SCALE24_FROM_FLOAT (1.0);
style->stroke_opacity.set = TRUE;
+
+ style->opacity.value = SP_SCALE24_FROM_FLOAT (cf[3]);
+ style->opacity.set = TRUE;
}
return ret;
if (css->attribute("stop-color"))
sp_repr_css_set_property (stop, "stop-color", css->attribute("stop-color"));
- // any of opacity properties, in order of increasing priority:
- if (css->attribute("flood-opacity"))
- sp_repr_css_set_property (stop, "stop-opacity", css->attribute("flood-color"));
-
- if (css->attribute("opacity")) // TODO: multiply
- sp_repr_css_set_property (stop, "stop-opacity", css->attribute("color"));
-
- if (css->attribute("stroke-opacity")) // TODO: multiply
- sp_repr_css_set_property (stop, "stop-opacity", css->attribute("stroke-opacity"));
-
- if (css->attribute("fill-opacity")) // TODO: multiply
- sp_repr_css_set_property (stop, "stop-opacity", css->attribute("fill-opacity"));
- if ((css->attribute("fill") && !strcmp(css->attribute("fill"), "none")) ||
- (css->attribute("stroke") && !strcmp(css->attribute("stroke"), "none")))
- sp_repr_css_set_property (stop, "stop-opacity", "0"); // if set to none, don't change color, set opacity to 0
-
- if (css->attribute("stop-opacity"))
+ if (css->attribute("stop-opacity")) { // direct setting of stop-opacity has priority
sp_repr_css_set_property (stop, "stop-opacity", css->attribute("stop-opacity"));
+ } else { // multiply all opacity properties:
+ gdouble accumulated = 1.0;
+ accumulated *= sp_svg_read_percentage(css->attribute("flood-opacity"), 1.0);
+ accumulated *= sp_svg_read_percentage(css->attribute("opacity"), 1.0);
+ accumulated *= sp_svg_read_percentage(css->attribute("stroke-opacity"), 1.0);
+ accumulated *= sp_svg_read_percentage(css->attribute("fill-opacity"), 1.0);
+
+ Inkscape::CSSOStringStream os;
+ os << accumulated;
+ sp_repr_css_set_property (stop, "stop-opacity", os.str().c_str());
+
+ if ((css->attribute("fill") && !strcmp(css->attribute("fill"), "none")) ||
+ (css->attribute("stroke") && !strcmp(css->attribute("stroke"), "none")))
+ sp_repr_css_set_property (stop, "stop-opacity", "0"); // if set to none, don't change color, set opacity to 0
+ }
if (!stop->attributeList()) { // nothing for us here, pass it on
sp_repr_css_attr_unref(stop);
return false;
}
- for (GSList const* i = drag->selected->draggables; i != NULL; i = i->next) { // for all draggables of dragger
- GrDraggable *draggable = (GrDraggable *) i->data;
+ for (GList const* sel = drag->selected; sel != NULL; sel = sel->next) { // for all selected draggers
+ GrDragger* dragger = (GrDragger*) sel->data;
+ for (GSList const* i = dragger->draggables; i != NULL; i = i->next) { // for all draggables of dragger
+ GrDraggable *draggable = (GrDraggable *) i->data;
- drag->local_change = true;
- sp_item_gradient_stop_set_style (draggable->item, draggable->point_num, draggable->fill_or_stroke, stop);
+ drag->local_change = true;
+ sp_item_gradient_stop_set_style (draggable->item, draggable->point_type, draggable->point_i, draggable->fill_or_stroke, stop);
+ }
}
//sp_repr_css_print(stop);
this->updateLevels ();
if (desktop->gr_item) {
- this->setSelected (getDraggerFor (desktop->gr_item, desktop->gr_point_num, desktop->gr_fill_or_stroke));
+ this->setSelected (getDraggerFor (desktop->gr_item, desktop->gr_point_type, desktop->gr_point_i, desktop->gr_fill_or_stroke));
}
}
this->style_query_connection.disconnect();
if (this->selected) {
- GrDraggable *draggable = (GrDraggable *) this->selected->draggables->data;
+ GrDraggable *draggable = (GrDraggable *) ((GrDragger*)this->selected->data)->draggables->data;
desktop->gr_item = draggable->item;
- desktop->gr_point_num = draggable->point_num;
+ desktop->gr_point_type = draggable->point_type;
+ desktop->gr_point_i = draggable->point_i;
desktop->gr_fill_or_stroke = draggable->fill_or_stroke;
} else {
desktop->gr_item = NULL;
- desktop->gr_point_num = 0;
+ desktop->gr_point_type = 0;
+ desktop->gr_point_i = 0;
desktop->gr_fill_or_stroke = true;
}
+ deselect_all();
for (GList *l = this->draggers; l != NULL; l = l->next) {
delete ((GrDragger *) l->data);
}
this->lines = NULL;
}
-GrDraggable::GrDraggable (SPItem *item, guint point_num, bool fill_or_stroke)
+GrDraggable::GrDraggable (SPItem *item, guint point_type, guint point_i, bool fill_or_stroke)
{
this->item = item;
- this->point_num = point_num;
+ this->point_type = point_type;
+ this->point_i = point_i;
this->fill_or_stroke = fill_or_stroke;
g_object_ref (G_OBJECT (this->item));
g_object_unref (G_OBJECT (this->item));
}
-NR::Point *
+// FIXME: make global function in libnr or somewhere.
+static NR::Point *
get_snap_vector (NR::Point p, NR::Point o, double snap, double initial)
{
double r = NR::L2 (p - o);
return new NR::Point (o + r * NR::Point(cos(a_snapped), sin(a_snapped)) - p);
}
+// FIXME: make global function in libnr or somewhere.
+static NR::Point
+snap_vector_midpoint (NR::Point p, NR::Point begin, NR::Point end, double snap)
+{
+ 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;
+
+ double snapdist = length * snap;
+ double r_snapped = (snap==0) ? r : floor(r/(snapdist + 0.5)) * snapdist;
+
+ return (begin + r_snapped * be);
+}
+
static void
gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpointer data)
{
GrDragger *dragger = (GrDragger *) data;
+ GrDrag *drag = dragger->parent;
NR::Point p = *ppointer;
@@ -367,7 +411,7 @@ gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpoi
for (GSList const* i = dragger->draggables; i != NULL; i = i->next) { // for all draggables of dragger
GrDraggable *draggable = (GrDraggable *) i->data;
// copy draggable to d_new:
- GrDraggable *da_new = new GrDraggable (draggable->item, draggable->point_num, draggable->fill_or_stroke);
+ GrDraggable *da_new = new GrDraggable (draggable->item, draggable->point_type, draggable->point_i, draggable->fill_or_stroke);
d_new->addDraggable (da_new);
}
@@ -383,24 +427,32 @@ gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpoi
d_new->updateTip ();
d_new->updateDependencies(true);
sp_document_done (sp_desktop_document (d_new->parent->desktop), SP_VERB_CONTEXT_GRADIENT,
- /* TODO: annotate */ "gradient-drag.cpp:386");
+ _("Merge gradient handles"));
return;
}
}
}
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);
+ }
}
}
}
@@ -417,13 +469,14 @@ gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpoi
NR::Point *dr_snap = NULL;
- if (draggable->point_num == POINT_LG_P1 || draggable->point_num == POINT_LG_P2) {
+ if (draggable->point_type == POINT_LG_BEGIN || draggable->point_type == POINT_LG_END) {
for (GList *di = dragger->parent->draggers; di != NULL; di = di->next) {
GrDragger *d_new = (GrDragger *) di->data;
if (d_new == dragger)
continue;
if (d_new->isA (draggable->item,
- draggable->point_num == POINT_LG_P1? POINT_LG_P2 : POINT_LG_P1,
+ draggable->point_type == POINT_LG_BEGIN? POINT_LG_END : POINT_LG_BEGIN,
+ draggable->point_i,
draggable->fill_or_stroke)) {
// found the other end of the linear gradient;
if (state & GDK_SHIFT_MASK) {
@@ -436,19 +489,20 @@ gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpoi
}
}
}
- } else if (draggable->point_num == POINT_RG_R1 || draggable->point_num == POINT_RG_R2 || draggable->point_num == POINT_RG_FOCUS) {
+ } else if (draggable->point_type == POINT_RG_R1 || draggable->point_type == POINT_RG_R2 || draggable->point_type == POINT_RG_FOCUS) {
for (GList *di = dragger->parent->draggers; di != NULL; di = di->next) {
GrDragger *d_new = (GrDragger *) di->data;
if (d_new == dragger)
continue;
if (d_new->isA (draggable->item,
POINT_RG_CENTER,
+ draggable->point_i,
draggable->fill_or_stroke)) {
// found the center of the radial gradient;
dr_snap = &(d_new->point);
}
}
- } else if (draggable->point_num == POINT_RG_CENTER) {
+ } else if (draggable->point_type == POINT_RG_CENTER) {
// radial center snaps to hor/vert relative to its original position
dr_snap = &(dragger->point_original);
}
@@ -479,6 +533,8 @@ gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpoi
p += move;
sp_knot_moveto (knot, &p);
}
+
+ g_slist_free(snap_vectors);
}
dragger->point = p;
@@ -490,6 +546,132 @@ gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpoi
}
dragger->updateDependencies(false);
+
+ drag->keep_selection = (bool) g_list_find(drag->selected, dragger);
+}
+
+
+/**
+Called when a midpoint knot is dragged.
+*/
+static void
+gr_knot_moved_midpoint_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpointer data)
+{
+ GrDragger *dragger = (GrDragger *) data;
+ GrDrag *drag = dragger->parent;
+ // a midpoint dragger can (logically) only contain one GrDraggable
+ GrDraggable *draggable = (GrDraggable *) dragger->draggables->data;
+
+ // FIXME: take from prefs
+ double snap_fraction = 0.1;
+
+ NR::Point p = *ppointer;
+ NR::Point begin(0,0), end(0,0);
+
+ SPObject *server;
+ if (draggable->fill_or_stroke)
+ server = SP_OBJECT_STYLE_FILL_SERVER (draggable->item);
+ else
+ server = SP_OBJECT_STYLE_STROKE_SERVER (draggable->item);
+
+
+ // get begin and end points between which dragging is allowed:
+ // the draglimits are between knot(lowest_i - 1) and knot(highest_i + 1)
+ GSList *moving = NULL;
+ moving = g_slist_append(moving, dragger);
+
+ guint lowest_i = draggable->point_i;
+ guint highest_i = draggable->point_i;
+ GrDragger *lowest_dragger = dragger;
+ GrDragger *highest_dragger = dragger;
+ bool is_selected = g_list_find(drag->selected, dragger);
+ if (is_selected) {
+ GrDragger* d_add;
+ while ( true )
+ {
+ d_add = drag->getDraggerFor(draggable->item, draggable->point_type, lowest_i - 1, draggable->fill_or_stroke);
+ if ( d_add && g_list_find(drag->selected, d_add) ) {
+ lowest_i = lowest_i - 1;
+ moving = g_slist_prepend(moving, d_add);
+ lowest_dragger = d_add;
+ } else {
+ break;
+ }
+ }
+
+ while ( true )
+ {
+ d_add = drag->getDraggerFor(draggable->item, draggable->point_type, highest_i + 1, draggable->fill_or_stroke);
+ if ( d_add && g_list_find(drag->selected, d_add) ) {
+ highest_i = highest_i + 1;
+ moving = g_slist_append(moving, d_add);
+ highest_dragger = d_add;
+ } else {
+ break;
+ }
+ }
+ }
+
+ if ( SP_IS_LINEARGRADIENT(server) ) {
+ GrDragger *d_temp;
+ if (lowest_i == 1) {
+ d_temp = drag->getDraggerFor (draggable->item, POINT_LG_BEGIN, 0, draggable->fill_or_stroke);
+ } else {
+ d_temp = drag->getDraggerFor (draggable->item, POINT_LG_MID, lowest_i - 1, draggable->fill_or_stroke);
+ }
+ if (d_temp) begin = d_temp->point;
+
+ d_temp = drag->getDraggerFor (draggable->item, POINT_LG_MID, highest_i + 1, draggable->fill_or_stroke);
+ if (d_temp == NULL) {
+ d_temp = drag->getDraggerFor (draggable->item, POINT_LG_END, 0, draggable->fill_or_stroke);
+ }
+ if (d_temp) end = d_temp->point;
+ } else if ( SP_IS_RADIALGRADIENT(server) ) {
+ GrDragger *d_temp;
+ if (lowest_i == 1) {
+ d_temp = drag->getDraggerFor (draggable->item, POINT_RG_CENTER, 0, draggable->fill_or_stroke);
+ } else {
+ d_temp = drag->getDraggerFor (draggable->item, draggable->point_type, lowest_i - 1, draggable->fill_or_stroke);
+ }
+ if (d_temp) begin = d_temp->point;
+
+ d_temp = drag->getDraggerFor (draggable->item, draggable->point_type, highest_i + 1, draggable->fill_or_stroke);
+ if (d_temp == NULL) {
+ d_temp = drag->getDraggerFor (draggable->item, (draggable->point_type==POINT_RG_MID1) ? POINT_RG_R1 : POINT_RG_R2, 0, draggable->fill_or_stroke);
+ }
+ if (d_temp) end = d_temp->point;
+ }
+
+ NR::Point low_lim = dragger->point - (lowest_dragger->point - begin);
+ NR::Point high_lim = dragger->point - (highest_dragger->point - end);
+
+ if (state & GDK_CONTROL_MASK) {
+ p = snap_vector_midpoint (p, low_lim, high_lim, snap_fraction);
+ } else {
+ p = snap_vector_midpoint (p, low_lim, high_lim, 0);
+ }
+ NR::Point displacement = p - dragger->point;
+
+ for (GSList const* i = moving; i != NULL; i = i->next) {
+ GrDragger *drg = (GrDragger*) i->data;
+ SPKnot *drgknot = drg->knot;
+ drg->point += displacement;
+ sp_knot_moveto (drgknot, & drg->point);
+ drg->fireDraggables (false);
+ drg->updateDependencies(false);
+ }
+
+ drag->keep_selection = is_selected;
+}
+
+
+
+static void
+gr_knot_grabbed_handler (SPKnot *knot, unsigned int state, gpointer data)
+{
+ GrDragger *dragger = (GrDragger *) data;
+
+ sp_canvas_force_full_redraw_after_interruptions(dragger->parent->desktop->canvas, 5);
}
/**
{
GrDragger *dragger = (GrDragger *) data;
+ sp_canvas_end_forced_full_redraws(dragger->parent->desktop->canvas);
+
dragger->point_original = dragger->point = knot->pos;
if ((state & GDK_CONTROL_MASK) && (state & GDK_SHIFT_MASK)) {
}
// make this dragger selected
- dragger->parent->setSelected (dragger);
+ if (!dragger->parent->keep_selection) {
+ dragger->parent->setSelected (dragger);
+ }
+ dragger->parent->keep_selection = false;
dragger->updateDependencies(true);
// we did an undoable action
- sp_document_done (sp_desktop_document (dragger->parent->desktop), SP_VERB_CONTEXT_GRADIENT,
- /* TODO: annotate */ "gradient-drag.cpp:518");
+ sp_document_done (sp_desktop_document (dragger->parent->desktop), SP_VERB_CONTEXT_GRADIENT,
+ _("Move gradient handle"));
}
/**
-Called when a dragger knot is clicked; selects the dragger
+Called when a dragger knot is clicked; selects the dragger or deletes it depending on the
+state of the keyboard keys
*/
static void
gr_knot_clicked_handler(SPKnot *knot, guint state, gpointer data)
{
- GrDragger *dragger = (GrDragger *) data;
-
- dragger->point_original = dragger->point;
+ GrDragger *dragger = (GrDragger *) data;
+ GrDraggable *draggable = (GrDraggable *) dragger->draggables->data;
+ if (!draggable) return;
+
+ if ( (state & GDK_CONTROL_MASK) && (state & GDK_MOD1_MASK ) ) {
+ // delete this knot from vector
+ SPGradient *gradient = sp_item_gradient (draggable->item, draggable->fill_or_stroke);
+ gradient = sp_gradient_get_vector (gradient, false);
+ if (gradient->vector.stops.size() > 2) { // 2 is the minimum
+ SPStop *stop = NULL;
+ switch (draggable->point_type) { // if we delete first or last stop, move the next/previous to the edge
+ case POINT_LG_BEGIN:
+ case POINT_RG_CENTER:
+ stop = sp_first_stop(gradient);
+ {
+ SPStop *next = sp_next_stop (stop);
+ if (next) {
+ next->offset = 0;
+ sp_repr_set_css_double (SP_OBJECT_REPR (next), "offset", 0);
+ }
+ }
+ break;
+ case POINT_LG_END:
+ case POINT_RG_R1:
+ case POINT_RG_R2:
+ stop = sp_last_stop(gradient);
+ {
+ SPStop *prev = sp_prev_stop (stop, gradient);
+ if (prev) {
+ prev->offset = 1;
+ sp_repr_set_css_double (SP_OBJECT_REPR (prev), "offset", 1);
+ }
+ }
+ break;
+ case POINT_LG_MID:
+ case POINT_RG_MID1:
+ case POINT_RG_MID2:
+ stop = sp_get_stop_i(gradient, draggable->point_i);
+ break;
+ }
+
+ SP_OBJECT_REPR(gradient)->removeChild(SP_OBJECT_REPR(stop));
+ sp_document_done (SP_OBJECT_DOCUMENT (gradient), SP_VERB_CONTEXT_GRADIENT,
+ _("Delete gradient stop"));
+ }
+ } else {
+ // select the dragger
+ dragger->point_original = dragger->point;
- dragger->parent->setSelected (dragger);
+ if ( state & GDK_SHIFT_MASK ) {
+ dragger->parent->setSelected (dragger, true, false);
+ } else {
+ dragger->parent->setSelected (dragger);
+ }
+ }
}
/**
@@ -537,15 +775,15 @@ Called when a dragger knot is doubleclicked; opens gradient editor with the stop
static void
gr_knot_doubleclicked_handler (SPKnot *knot, guint state, gpointer data)
{
- GrDragger *dragger = (GrDragger *) data;
+ GrDragger *dragger = (GrDragger *) data;
- dragger->point_original = dragger->point;
+ dragger->point_original = dragger->point;
- if (dragger->draggables == NULL)
- return;
+ if (dragger->draggables == NULL)
+ return;
- GrDraggable *draggable = (GrDraggable *) dragger->draggables->data;
- sp_item_gradient_edit_stop (draggable->item, draggable->point_num, draggable->fill_or_stroke);
+ GrDraggable *draggable = (GrDraggable *) dragger->draggables->data;
+ sp_item_gradient_edit_stop (draggable->item, draggable->point_type, draggable->point_i, draggable->fill_or_stroke);
}
/**
@@ -563,20 +801,22 @@ GrDragger::fireDraggables (bool write_repr, bool scale_radial, bool merging_focu
// change gradient, optionally writing to repr; prevent focus from moving if it's snapped
// to the center, unless it's the first update upon merge when we must snap it to the point
if (merging_focus ||
- !(draggable->point_num == POINT_RG_FOCUS && this->isA(draggable->item, POINT_RG_CENTER, draggable->fill_or_stroke)))
- sp_item_gradient_set_coords (draggable->item, draggable->point_num, this->point, draggable->fill_or_stroke, write_repr, scale_radial);
+ !(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);
+ }
}
}
/**
-Checks if the dragger has a draggable with this point_num
+Checks if the dragger has a draggable with this point_type
*/
bool
-GrDragger::isA (guint point_num)
+GrDragger::isA (guint point_type)
{
for (GSList const* i = this->draggables; i != NULL; i = i->next) {
GrDraggable *draggable = (GrDraggable *) i->data;
- if (draggable->point_num == point_num) {
+ if (draggable->point_type == point_type) {
return true;
}
}
}
/**
-Checks if the dragger has a draggable with this item, point_num, fill_or_stroke
+Checks if the dragger has a draggable with this item, point_type, fill_or_stroke
*/
bool
-GrDragger::isA (SPItem *item, guint point_num, bool fill_or_stroke)
+GrDragger::isA (SPItem *item, guint point_type, guint point_i, bool fill_or_stroke)
{
for (GSList const* i = this->draggables; i != NULL; i = i->next) {
GrDraggable *draggable = (GrDraggable *) i->data;
- if (draggable->point_num == point_num && draggable->item == item && draggable->fill_or_stroke == fill_or_stroke) {
+ if ( (draggable->point_type == point_type) && (draggable->point_i == point_i) && (draggable->item == item) && (draggable->fill_or_stroke == fill_or_stroke) ) {
return true;
}
}
{
if ((this->item == da2->item) && (this->fill_or_stroke == da2->fill_or_stroke)) {
// we must not merge the points of the same gradient!
- if (!((this->point_num == POINT_RG_FOCUS && da2->point_num == POINT_RG_CENTER) ||
- (this->point_num == POINT_RG_CENTER && da2->point_num == POINT_RG_FOCUS))) {
+ if (!((this->point_type == POINT_RG_FOCUS && da2->point_type == POINT_RG_CENTER) ||
+ (this->point_type == POINT_RG_CENTER && da2->point_type == POINT_RG_FOCUS))) {
// except that we can snap center and focus together
return false;
}
}
+ // disable merging of midpoints.
+ if ( (this->point_type == POINT_LG_MID) || (da2->point_type == POINT_LG_MID)
+ || (this->point_type == POINT_RG_MID1) || (da2->point_type == POINT_RG_MID1)
+ || (this->point_type == POINT_RG_MID2) || (da2->point_type == POINT_RG_MID2) )
+ return false;
+
return true;
}
if (g_slist_length (this->draggables) == 1) {
GrDraggable *draggable = (GrDraggable *) this->draggables->data;
char *item_desc = sp_item_description(draggable->item);
- this->knot->tip = g_strdup_printf (_("%s for: %s%s; drag with <b>Ctrl</b> to snap angle, with <b>Ctrl+Alt</b> to preserve angle, with <b>Ctrl+Shift</b> to scale around center"),
- _(gr_knot_descr[draggable->point_num]),
- item_desc,
- draggable->fill_or_stroke == false ? _(" (stroke)") : "");
+ switch (draggable->point_type) {
+ case POINT_LG_MID:
+ case POINT_RG_MID1:
+ case POINT_RG_MID2:
+ this->knot->tip = g_strdup_printf (_("%s %d for: %s%s; drag with <b>Ctrl</b> to snap offset; click with <b>Ctrl+Alt</b> to delete stop"),
+ _(gr_knot_descr[draggable->point_type]),
+ draggable->point_i,
+ item_desc,
+ draggable->fill_or_stroke == false ? _(" (stroke)") : "");
+ break;
+
+ default:
+ this->knot->tip = g_strdup_printf (_("%s for: %s%s; drag with <b>Ctrl</b> to snap angle, with <b>Ctrl+Alt</b> to preserve angle, with <b>Ctrl+Shift</b> to scale around center"),
+ _(gr_knot_descr[draggable->point_type]),
+ item_desc,
+ draggable->fill_or_stroke == false ? _(" (stroke)") : "");
+ break;
+ }
g_free(item_desc);
} else if (g_slist_length (draggables) == 2 && isA (POINT_RG_CENTER) && isA (POINT_RG_FOCUS)) {
this->knot->tip = g_strdup_printf (_("Radial gradient <b>center</b> and <b>focus</b>; drag with <b>Shift</b> to separate focus"));
if (!draggables)
return;
GrDraggable *last = (GrDraggable *) g_slist_last(draggables)->data;
- g_object_set (G_OBJECT (this->knot->item), "shape", gr_knot_shapes[last->point_num], NULL);
+ g_object_set (G_OBJECT (this->knot->item), "shape", gr_knot_shapes[last->point_type], NULL);
}
/**
Moves this dragger to the point of the given draggable, acting upon all other draggables
*/
void
-GrDragger::moveThisToDraggable (SPItem *item, guint point_num, bool fill_or_stroke, bool write_repr)
+GrDragger::moveThisToDraggable (SPItem *item, guint point_type, guint point_i, bool fill_or_stroke, bool write_repr)
{
- this->point = sp_item_gradient_get_coords (item, point_num, fill_or_stroke);
+ this->point = sp_item_gradient_get_coords (item, point_type, point_i, fill_or_stroke);
this->point_original = this->point;
sp_knot_moveto (this->knot, &(this->point));
for (GSList const* i = this->draggables; i != NULL; i = i->next) {
GrDraggable *da = (GrDraggable *) i->data;
- if (da->item == item && da->point_num == point_num && da->fill_or_stroke == fill_or_stroke) {
+ if ( (da->item == item) && (da->point_type == point_type) && (da->point_i == point_i) && (da->fill_or_stroke == fill_or_stroke) ) {
continue;
}
- sp_item_gradient_set_coords (da->item, da->point_num, this->point, da->fill_or_stroke, write_repr, false);
+ sp_item_gradient_set_coords (da->item, da->point_type, da->point_i, this->point, da->fill_or_stroke, write_repr, false);
}
// FIXME: here we should also call this->updateDependencies(write_repr); to propagate updating, but how to prevent loops?
}
+/**
+Moves all midstop draggables that depend on this one
+ */
+void
+GrDragger::updateMidstopDependencies (GrDraggable *draggable, bool write_repr) {
+ SPObject *server;
+ if (draggable->fill_or_stroke)
+ server = SP_OBJECT_STYLE_FILL_SERVER (draggable->item);
+ else
+ server = SP_OBJECT_STYLE_STROKE_SERVER (draggable->item);
+ guint num = SP_GRADIENT(server)->vector.stops.size();
+ if (num <= 2) return;
+
+ if ( SP_IS_LINEARGRADIENT(server) ) {
+ for ( guint i = 1; i < num - 1; i++ ) {
+ this->moveOtherToDraggable (draggable->item, POINT_LG_MID, i, draggable->fill_or_stroke, write_repr);
+ }
+ } else if ( SP_IS_RADIALGRADIENT(server) ) {
+ for ( guint i = 1; i < num - 1; i++ ) {
+ this->moveOtherToDraggable (draggable->item, POINT_RG_MID1, i, draggable->fill_or_stroke, write_repr);
+ this->moveOtherToDraggable (draggable->item, POINT_RG_MID2, i, draggable->fill_or_stroke, write_repr);
+ }
+ }
+}
+
+
/**
Moves all draggables that depend on this one
*/
{
for (GSList const* i = this->draggables; i != NULL; i = i->next) {
GrDraggable *draggable = (GrDraggable *) i->data;
- switch (draggable->point_num) {
- case POINT_LG_P1:
- // the other point is dependent only when dragging with ctrl+shift
- this->moveOtherToDraggable (draggable->item, POINT_LG_P2, draggable->fill_or_stroke, write_repr);
+ switch (draggable->point_type) {
+ case POINT_LG_BEGIN:
+ {
+ // the end point is dependent only when dragging with ctrl+shift
+ this->moveOtherToDraggable (draggable->item, POINT_LG_END, 0, draggable->fill_or_stroke, write_repr);
+
+ this->updateMidstopDependencies (draggable, write_repr);
+ }
+ break;
+ case POINT_LG_END:
+ {
+ // the begin point is dependent only when dragging with ctrl+shift
+ this->moveOtherToDraggable (draggable->item, POINT_LG_BEGIN, 0, draggable->fill_or_stroke, write_repr);
+
+ this->updateMidstopDependencies (draggable, write_repr);
+ }
break;
- case POINT_LG_P2:
- this->moveOtherToDraggable (draggable->item, POINT_LG_P1, draggable->fill_or_stroke, write_repr);
+ case POINT_LG_MID:
+ // no other nodes depend on mid points.
break;
case POINT_RG_R2:
- this->moveOtherToDraggable (draggable->item, POINT_RG_R1, draggable->fill_or_stroke, write_repr);
- this->moveOtherToDraggable (draggable->item, POINT_RG_FOCUS, draggable->fill_or_stroke, write_repr);
+ this->moveOtherToDraggable (draggable->item, POINT_RG_R1, 0, draggable->fill_or_stroke, write_repr);
+ this->moveOtherToDraggable (draggable->item, POINT_RG_FOCUS, 0, draggable->fill_or_stroke, write_repr);
+ this->updateMidstopDependencies (draggable, write_repr);
break;
case POINT_RG_R1:
- this->moveOtherToDraggable (draggable->item, POINT_RG_R2, draggable->fill_or_stroke, write_repr);
- this->moveOtherToDraggable (draggable->item, POINT_RG_FOCUS, draggable->fill_or_stroke, write_repr);
+ this->moveOtherToDraggable (draggable->item, POINT_RG_R2, 0, draggable->fill_or_stroke, write_repr);
+ this->moveOtherToDraggable (draggable->item, POINT_RG_FOCUS, 0, draggable->fill_or_stroke, write_repr);
+ this->updateMidstopDependencies (draggable, write_repr);
break;
case POINT_RG_CENTER:
- this->moveOtherToDraggable (draggable->item, POINT_RG_R1, draggable->fill_or_stroke, write_repr);
- this->moveOtherToDraggable (draggable->item, POINT_RG_R2, draggable->fill_or_stroke, write_repr);
- this->moveOtherToDraggable (draggable->item, POINT_RG_FOCUS, draggable->fill_or_stroke, write_repr);
+ this->moveOtherToDraggable (draggable->item, POINT_RG_R1, 0, draggable->fill_or_stroke, write_repr);
+ this->moveOtherToDraggable (draggable->item, POINT_RG_R2, 0, draggable->fill_or_stroke, write_repr);
+ this->moveOtherToDraggable (draggable->item, POINT_RG_FOCUS, 0, draggable->fill_or_stroke, write_repr);
+ this->updateMidstopDependencies (draggable, write_repr);
break;
case POINT_RG_FOCUS:
// nothing can depend on that
break;
+ case POINT_RG_MID1:
+ this->moveOtherToDraggable (draggable->item, POINT_RG_MID2, draggable->point_i, draggable->fill_or_stroke, write_repr);
+ break;
+ case POINT_RG_MID2:
+ this->moveOtherToDraggable (draggable->item, POINT_RG_MID1, draggable->point_i, draggable->fill_or_stroke, write_repr);
+ break;
default:
break;
}
sp_knot_show (this->knot);
// connect knot's signals
- this->handler_id = g_signal_connect (G_OBJECT (this->knot), "moved", G_CALLBACK (gr_knot_moved_handler), this);
+ if ( (draggable) // it can be NULL if a node in unsnapped (eg. focus point unsnapped from center)
+ // luckily, midstops never snap to other nodes so are never unsnapped...
+ && ( (draggable->point_type == POINT_LG_MID)
+ || (draggable->point_type == POINT_RG_MID1)
+ || (draggable->point_type == POINT_RG_MID2) ) )
+ {
+ this->handler_id = g_signal_connect (G_OBJECT (this->knot), "moved", G_CALLBACK (gr_knot_moved_midpoint_handler), this);
+ } else {
+ this->handler_id = g_signal_connect (G_OBJECT (this->knot), "moved", G_CALLBACK (gr_knot_moved_handler), this);
+ }
g_signal_connect (G_OBJECT (this->knot), "clicked", G_CALLBACK (gr_knot_clicked_handler), this);
g_signal_connect (G_OBJECT (this->knot), "doubleclicked", G_CALLBACK (gr_knot_doubleclicked_handler), this);
+ g_signal_connect (G_OBJECT (this->knot), "grabbed", G_CALLBACK (gr_knot_grabbed_handler), this);
g_signal_connect (G_OBJECT (this->knot), "ungrabbed", G_CALLBACK (gr_knot_ungrabbed_handler), this);
// add the initial draggable
GrDragger::~GrDragger ()
{
// unselect if it was selected
- if (this->parent->selected == this)
- this->parent->setSelected (NULL);
+ this->parent->setDeselected(this);
+
+ // disconnect signals
+ g_signal_handlers_disconnect_by_func(G_OBJECT(this->knot), (gpointer) G_CALLBACK (gr_knot_moved_handler), this);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(this->knot), (gpointer) G_CALLBACK (gr_knot_clicked_handler), this);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(this->knot), (gpointer) G_CALLBACK (gr_knot_doubleclicked_handler), this);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(this->knot), (gpointer) G_CALLBACK (gr_knot_grabbed_handler), this);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(this->knot), (gpointer) G_CALLBACK (gr_knot_ungrabbed_handler), this);
/* unref should call destroy */
g_object_unref (G_OBJECT (this->knot));
Select the dragger which has the given draggable.
*/
GrDragger *
-GrDrag::getDraggerFor (SPItem *item, guint point_num, bool fill_or_stroke)
+GrDrag::getDraggerFor (SPItem *item, guint point_type, guint point_i, bool fill_or_stroke)
{
for (GList const* i = this->draggers; i != NULL; i = i->next) {
GrDragger *dragger = (GrDragger *) i->data;
for (GSList const* j = dragger->draggables; j != NULL; j = j->next) {
GrDraggable *da2 = (GrDraggable *) j->data;
- if (da2->item == item && da2->point_num == point_num && da2->fill_or_stroke == fill_or_stroke) {
+ if ( (da2->item == item) && (da2->point_type == point_type) && (da2->point_i == point_i) && (da2->fill_or_stroke == fill_or_stroke)) {
return (dragger);
}
}
void
-GrDragger::moveOtherToDraggable (SPItem *item, guint point_num, bool fill_or_stroke, bool write_repr)
+GrDragger::moveOtherToDraggable (SPItem *item, guint point_type, guint point_i, bool fill_or_stroke, bool write_repr)
{
- GrDragger *d = this->parent->getDraggerFor (item, point_num, fill_or_stroke);
+ GrDragger *d = this->parent->getDraggerFor (item, point_type, point_i, fill_or_stroke);
if (d && d != this) {
- d->moveThisToDraggable (item, point_num, fill_or_stroke, write_repr);
+ d->moveThisToDraggable (item, point_type, point_i, fill_or_stroke, write_repr);
}
}
/**
-Set selected dragger
+ Draw this dragger as selected
*/
void
-GrDrag::setSelected (GrDragger *dragger)
+GrDragger::select()
{
- if (this->selected) {
- this->selected->knot->fill [SP_KNOT_STATE_NORMAL] = GR_KNOT_COLOR_NORMAL;
- g_object_set (G_OBJECT (this->selected->knot->item), "fill_color", GR_KNOT_COLOR_NORMAL, NULL);
+ this->knot->fill [SP_KNOT_STATE_NORMAL] = GR_KNOT_COLOR_SELECTED;
+ g_object_set (G_OBJECT (this->knot->item), "fill_color", GR_KNOT_COLOR_SELECTED, NULL);
+}
+
+/**
+ Draw this dragger as normal (deselected)
+*/
+void
+GrDragger::deselect()
+{
+ this->knot->fill [SP_KNOT_STATE_NORMAL] = GR_KNOT_COLOR_NORMAL;
+ g_object_set (G_OBJECT (this->knot->item), "fill_color", GR_KNOT_COLOR_NORMAL, NULL);
+}
+
+
+
+/**
+\brief Deselect all stops/draggers (private)
+*/
+void
+GrDrag::deselect_all()
+{
+ while (selected) {
+ ( (GrDragger*) selected->data)->deselect();
+ selected = g_list_remove(selected, selected->data);
}
- if (dragger) {
- dragger->knot->fill [SP_KNOT_STATE_NORMAL] = GR_KNOT_COLOR_SELECTED;
- g_object_set (G_OBJECT (dragger->knot->item), "fill_color", GR_KNOT_COLOR_SELECTED, NULL);
+}
+
+/**
+\brief Deselect all stops/draggers (public; emits signal)
+*/
+void
+GrDrag::deselectAll()
+{
+ deselect_all();
+ this->desktop->emitToolSubselectionChanged(NULL);
+}
+
+
+/**
+\brief Select a dragger
+\param dragger The dragger to select
+\param add_to_selection If true, add to selection, otherwise deselect others
+\param override If true, always select this node, otherwise toggle selected status
+*/
+void
+GrDrag::setSelected (GrDragger *dragger, bool add_to_selection, bool override)
+{
+ GrDragger *seldragger = NULL;
+
+ if (add_to_selection) {
+ if (!dragger) return;
+ if (override) {
+ if (!g_list_find(selected, dragger)) {
+ selected = g_list_prepend(selected, dragger);
+ }
+ dragger->select();
+ seldragger = dragger;
+ } else { // toggle
+ if (g_list_find(selected, dragger)) {
+ selected = g_list_remove(selected, dragger);
+ dragger->deselect();
+ if (selected) {
+ seldragger = (GrDragger*) selected->data; // select the dragger that is first in the list
+ }
+ } else {
+ selected = g_list_prepend(selected, dragger);
+ dragger->select();
+ seldragger = dragger;
+ }
+ }
+ } else {
+ deselect_all();
+ if (dragger) {
+ selected = g_list_prepend(selected, dragger);
+ dragger->select();
+ seldragger = dragger;
+ }
+ }
+ if (seldragger) {
+ this->desktop->emitToolSubselectionChanged((gpointer) seldragger);
}
- this->selected = dragger;
+}
- this->desktop->emitToolSubselectionChanged((gpointer) dragger);
+/**
+\brief Deselect a dragger
+\param dragger The dragger to deselect
+*/
+void
+GrDrag::setDeselected (GrDragger *dragger)
+{
+ if (g_list_find(selected, dragger)) {
+ selected = g_list_remove(selected, dragger);
+ dragger->deselect();
+ }
+ this->desktop->emitToolSubselectionChanged((gpointer) (selected ? selected->data : NULL ));
}
+
+
/**
Create a line from p1 to p2 and add it to the lines list
*/
void
GrDrag::addDragger (GrDraggable *draggable)
{
- NR::Point p = sp_item_gradient_get_coords (draggable->item, draggable->point_num, draggable->fill_or_stroke);
+ NR::Point p = sp_item_gradient_get_coords (draggable->item, draggable->point_type, draggable->point_i, draggable->fill_or_stroke);
for (GList *i = this->draggers; i != NULL; i = i->next) {
GrDragger *dragger = (GrDragger *) i->data;
}
GrDragger *new_dragger = new GrDragger(this, p, draggable);
- this->draggers = g_list_prepend (this->draggers, new_dragger);
+ // fixme: draggers should be added AFTER the last one: this way tabbing through them will be from begin to end.
+ this->draggers = g_list_append (this->draggers, new_dragger);
}
/**
void
GrDrag::addDraggersRadial (SPRadialGradient *rg, SPItem *item, bool fill_or_stroke)
{
- addDragger (new GrDraggable (item, POINT_RG_CENTER, fill_or_stroke));
- addDragger (new GrDraggable (item, POINT_RG_FOCUS, fill_or_stroke));
- addDragger (new GrDraggable (item, POINT_RG_R1, fill_or_stroke));
- addDragger (new GrDraggable (item, POINT_RG_R2, fill_or_stroke));
+ addDragger (new GrDraggable (item, POINT_RG_CENTER, 0, fill_or_stroke));
+ guint num = rg->vector.stops.size();
+ if (num > 2) {
+ for ( guint i = 1; i < num - 1; i++ ) {
+ addDragger (new GrDraggable (item, POINT_RG_MID1, i, fill_or_stroke));
+ }
+ }
+ addDragger (new GrDraggable (item, POINT_RG_R1, 0, fill_or_stroke));
+ if (num > 2) {
+ for ( guint i = 1; i < num - 1; i++ ) {
+ addDragger (new GrDraggable (item, POINT_RG_MID2, i, fill_or_stroke));
+ }
+ }
+ addDragger (new GrDraggable (item, POINT_RG_R2, 0, fill_or_stroke));
+ addDragger (new GrDraggable (item, POINT_RG_FOCUS, 0, fill_or_stroke));
}
/**
void
GrDrag::addDraggersLinear (SPLinearGradient *lg, SPItem *item, bool fill_or_stroke)
{
- addDragger (new GrDraggable (item, POINT_LG_P1, fill_or_stroke));
- addDragger (new GrDraggable (item, POINT_LG_P2, fill_or_stroke));
+ addDragger (new GrDraggable (item, POINT_LG_BEGIN, 0, fill_or_stroke));
+ guint num = lg->vector.stops.size();
+ if (num > 2) {
+ for ( guint i = 1; i < num - 1; i++ ) {
+ addDragger (new GrDraggable (item, POINT_LG_MID, i, fill_or_stroke));
+ }
+ }
+ addDragger (new GrDraggable (item, POINT_LG_END, 0, fill_or_stroke));
}
/**
Artificially grab the knot of the dragger with this draggable; used by the gradient context
*/
void
-GrDrag::grabKnot (SPItem *item, guint point_num, bool fill_or_stroke, gint x, gint y, guint32 etime)
+GrDrag::grabKnot (SPItem *item, guint point_type, guint point_i, bool fill_or_stroke, gint x, gint y, guint32 etime)
{
- GrDragger *dragger = getDraggerFor (item, point_num, fill_or_stroke);
+ GrDragger *dragger = getDraggerFor (item, point_type, point_i, fill_or_stroke);
if (dragger) {
sp_knot_start_dragging (dragger->knot, dragger->point, x, y, etime);
}
@@ -932,13 +1360,15 @@ modified, also when a radial dragger needs to update positions of other draggers
void
GrDrag::updateDraggers ()
{
- // delete old draggers and deselect
+ while (selected) {
+ selected = g_list_remove(selected, selected->data);
+ }
+ // delete old draggers
for (GList const* i = this->draggers; i != NULL; i = i->next) {
delete ((GrDragger *) i->data);
}
g_list_free (this->draggers);
this->draggers = NULL;
- this->selected = NULL;
g_return_if_fail (this->selection != NULL);
addDraggersRadial (SP_RADIALGRADIENT (server), item, false);
}
}
-
-
}
}
if (style && (style->fill.type == SP_PAINT_TYPE_PAINTSERVER)) {
SPObject *server = SP_OBJECT_STYLE_FILL_SERVER (item);
if (SP_IS_LINEARGRADIENT (server)) {
- this->addLine (sp_item_gradient_get_coords (item, POINT_LG_P1, true), sp_item_gradient_get_coords (item, POINT_LG_P2, true), GR_LINE_COLOR_FILL);
+ this->addLine (sp_item_gradient_get_coords (item, POINT_LG_BEGIN, 0, true), sp_item_gradient_get_coords (item, POINT_LG_END, 0, true), GR_LINE_COLOR_FILL);
} else if (SP_IS_RADIALGRADIENT (server)) {
- NR::Point center = sp_item_gradient_get_coords (item, POINT_RG_CENTER, true);
- this->addLine (center, sp_item_gradient_get_coords (item, POINT_RG_R1, true), GR_LINE_COLOR_FILL);
- this->addLine (center, sp_item_gradient_get_coords (item, POINT_RG_R2, true), GR_LINE_COLOR_FILL);
+ NR::Point center = sp_item_gradient_get_coords (item, POINT_RG_CENTER, 0, true);
+ this->addLine (center, sp_item_gradient_get_coords (item, POINT_RG_R1, 0, true), GR_LINE_COLOR_FILL);
+ this->addLine (center, sp_item_gradient_get_coords (item, POINT_RG_R2, 0, true), GR_LINE_COLOR_FILL);
}
}
if (style && (style->stroke.type == SP_PAINT_TYPE_PAINTSERVER)) {
SPObject *server = SP_OBJECT_STYLE_STROKE_SERVER (item);
if (SP_IS_LINEARGRADIENT (server)) {
- this->addLine (sp_item_gradient_get_coords (item, POINT_LG_P1, false), sp_item_gradient_get_coords (item, POINT_LG_P2, false), GR_LINE_COLOR_STROKE);
+ this->addLine (sp_item_gradient_get_coords (item, POINT_LG_BEGIN, 0, false), sp_item_gradient_get_coords (item, POINT_LG_END, 0, false), GR_LINE_COLOR_STROKE);
} else if (SP_IS_RADIALGRADIENT (server)) {
- NR::Point center = sp_item_gradient_get_coords (item, POINT_RG_CENTER, false);
- this->addLine (center, sp_item_gradient_get_coords (item, POINT_RG_R1, false), GR_LINE_COLOR_STROKE);
- this->addLine (center, sp_item_gradient_get_coords (item, POINT_RG_R2, false), GR_LINE_COLOR_STROKE);
+ NR::Point center = sp_item_gradient_get_coords (item, POINT_RG_CENTER, 0, false);
+ this->addLine (center, sp_item_gradient_get_coords (item, POINT_RG_R1, 0, false), GR_LINE_COLOR_STROKE);
+ this->addLine (center, sp_item_gradient_get_coords (item, POINT_RG_R2, 0, false), GR_LINE_COLOR_STROKE);
}
}
}
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]));
+ }
}
}
if (selected == NULL)
return;
- for (GSList const* i = selected->draggables; i != NULL; i = i->next) {
+ for (GSList const* i = ( (GrDragger*) selected->data )->draggables; i != NULL; i = i->next) {
GrDraggable *draggable = (GrDraggable *) i->data;
sp_item_gradient_reverse_vector (draggable->item, draggable->fill_or_stroke);
void
GrDrag::selected_move (double x, double y)
{
+/*
if (selected == NULL)
return;
+ if ( (g_list_length(selected) == 1) )
selected->point += NR::Point (x, y);
selected->point_original = selected->point;
sp_knot_moveto (selected->knot, &(selected->point));
// we did an undoable action
sp_document_done (sp_desktop_document (desktop), SP_VERB_CONTEXT_GRADIENT,
- /* TODO: annotate */ "gradient-drag.cpp:1071");
+ _("Move gradient handle"));
+*/
}
void
selected_move (zx, zy);
}
+/**
+Select the knot next to the last selected one and deselect all other selected.
+*/
void
GrDrag::select_next ()
{
- if (selected == NULL || g_list_find(draggers, selected)->next == NULL) {
+ if (selected == NULL || g_list_find(draggers, selected->data)->next == NULL) {
if (draggers)
setSelected ((GrDragger *) draggers->data);
} else {
- setSelected ((GrDragger *) g_list_find(draggers, selected)->next->data);
+ setSelected ((GrDragger *) g_list_find(draggers, selected->data)->next->data);
}
}
+/**
+Select the knot previous from the last selected one and deselect all other selected.
+*/
void
GrDrag::select_prev ()
{
- if (selected == NULL || g_list_find(draggers, selected)->prev == NULL) {
+ if (selected == NULL || g_list_find(draggers, selected->data)->prev == NULL) {
if (draggers)
setSelected ((GrDragger *) g_list_last (draggers)->data);
} else {
- setSelected ((GrDragger *) g_list_find(draggers, selected)->prev->data);
+ setSelected ((GrDragger *) g_list_find(draggers, selected->data)->prev->data);
+ }
+}
+
+
+// FIXME: i.m.o. an ugly function that I just made to work, but... aargh! (Johan)
+void
+GrDrag::deleteSelected (bool just_one)
+{
+ if (!selected) return;
+
+ SPDocument *document = false;
+
+ struct StructStopInfo {
+ SPStop * spstop;
+ GrDraggable * draggable;
+ SPGradient * gradient;
+ SPGradient * vector;
+ };
+
+ GSList *midstoplist = NULL; // list of stops that must be deleted (will be deleted first)
+ GSList *endstoplist = NULL; // list of stops that must be deleted
+ while (selected) {
+ GrDragger *dragger = (GrDragger*) selected->data;
+ 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_forked_vector_if_necessary (gradient, false);
+
+ switch (draggable->point_type) {
+ case POINT_LG_MID:
+ case POINT_RG_MID1:
+ case POINT_RG_MID2:
+ {
+ SPStop *stop = sp_get_stop_i(vector, draggable->point_i);
+ // check if already present in list. (e.g. when both RG_MID1 and RG_MID2 were selected)
+ bool present = false;
+ for (GSList const * l = midstoplist; l != NULL; l = l->next) {
+ if ( (SPStop*)l->data == stop ) {
+ present = true;
+ break; // no need to search further.
+ }
+ }
+ if (!present)
+ midstoplist = g_slist_append(midstoplist, stop);
+ }
+ break;
+ case POINT_LG_BEGIN:
+ case POINT_LG_END:
+ case POINT_RG_CENTER:
+ case POINT_RG_R1:
+ case POINT_RG_R2:
+ {
+ SPStop *stop = NULL;
+ if ( (draggable->point_type == POINT_LG_BEGIN) || (draggable->point_type == POINT_RG_CENTER) ) {
+ stop = sp_first_stop(vector);
+ } else {
+ stop = sp_last_stop(vector);
+ }
+ if (stop) {
+ StructStopInfo *stopinfo = new StructStopInfo;
+ stopinfo->spstop = stop;
+ stopinfo->draggable = draggable;
+ stopinfo->gradient = gradient;
+ stopinfo->vector = vector;
+ // check if already present in list. (e.g. when both R1 and R2 were selected)
+ bool present = false;
+ for (GSList const * l = endstoplist; l != NULL; l = l->next) {
+ if ( ((StructStopInfo*)l->data)->spstop == stopinfo->spstop ) {
+ present = true;
+ break; // no need to search further.
+ }
+ }
+ if (!present)
+ endstoplist = g_slist_append(endstoplist, stopinfo);
+ }
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ selected = g_list_remove(selected, dragger);
+ if ( just_one ) break; // iterate once if just_one is set.
+ }
+ while (midstoplist) {
+ SPStop *stop = (SPStop*) midstoplist->data;
+ document = SP_OBJECT_DOCUMENT (stop);
+ Inkscape::XML::Node * parent = SP_OBJECT_REPR(stop)->parent();
+ parent->removeChild(SP_OBJECT_REPR(stop));
+ midstoplist = g_slist_remove(midstoplist, stop);
+ }
+ while (endstoplist) {
+ StructStopInfo *stopinfo = (StructStopInfo*) endstoplist->data;
+ document = SP_OBJECT_DOCUMENT (stopinfo->spstop);
+
+ // 2 is the minimum, cannot delete more than that without deleting the whole vector
+ // cannot use vector->vector.stops.size() because the vector might be invalidated by deletion of a midstop
+ // manually count the children, don't know if there already exists a function for this...
+ int len = 0;
+ for ( SPObject *child = sp_object_first_child(stopinfo->vector) ;
+ child != NULL ;
+ child = SP_OBJECT_NEXT(child) )
+ {
+ if ( SP_IS_STOP(child) ) len ++;
+ }
+ if (len > 2)
+ {
+ switch (stopinfo->draggable->point_type) {
+ case POINT_LG_BEGIN:
+ {
+ SP_OBJECT_REPR(stopinfo->vector)->removeChild(SP_OBJECT_REPR(stopinfo->spstop));
+
+ SPLinearGradient *lg = SP_LINEARGRADIENT(stopinfo->gradient);
+ NR::Point oldbegin = NR::Point (lg->x1.computed, lg->y1.computed);
+ NR::Point end = NR::Point (lg->x2.computed, lg->y2.computed);
+ SPStop *stop = sp_first_stop(stopinfo->vector);
+ gdouble offset = stop->offset;
+ NR::Point newbegin = oldbegin + offset * (end - oldbegin);
+ lg->x1.computed = newbegin[NR::X];
+ lg->y1.computed = newbegin[NR::Y];
+
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(stopinfo->gradient);
+ sp_repr_set_svg_double(repr, "x1", lg->x1.computed);
+ sp_repr_set_svg_double(repr, "y1", lg->y1.computed);
+ stop->offset = 0;
+ sp_repr_set_css_double (SP_OBJECT_REPR (stop), "offset", 0);
+
+ // iterate through midstops to set new offset values such that they won't move on canvas.
+ SPStop *laststop = sp_last_stop(stopinfo->vector);
+ stop = sp_next_stop(stop);
+ while ( stop != laststop ) {
+ stop->offset = (stop->offset - offset)/(1 - offset);
+ sp_repr_set_css_double (SP_OBJECT_REPR (stop), "offset", stop->offset);
+ stop = sp_next_stop(stop);
+ }
+ }
+ break;
+ case POINT_LG_END:
+ {
+ SP_OBJECT_REPR(stopinfo->vector)->removeChild(SP_OBJECT_REPR(stopinfo->spstop));
+
+ SPLinearGradient *lg = SP_LINEARGRADIENT(stopinfo->gradient);
+ NR::Point begin = NR::Point (lg->x1.computed, lg->y1.computed);
+ NR::Point oldend = NR::Point (lg->x2.computed, lg->y2.computed);
+ SPStop *laststop = sp_last_stop(stopinfo->vector);
+ gdouble offset = laststop->offset;
+ NR::Point newend = begin + offset * (oldend - begin);
+ lg->x2.computed = newend[NR::X];
+ lg->y2.computed = newend[NR::Y];
+
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(stopinfo->gradient);
+ sp_repr_set_svg_double(repr, "x2", lg->x2.computed);
+ sp_repr_set_svg_double(repr, "y2", lg->y2.computed);
+ laststop->offset = 1;
+ sp_repr_set_css_double (SP_OBJECT_REPR (laststop), "offset", 1);
+
+ // iterate through midstops to set new offset values such that they won't move on canvas.
+ SPStop *stop = sp_first_stop(stopinfo->vector);
+ stop = sp_next_stop(stop);
+ while ( stop != laststop ) {
+ stop->offset = stop->offset / offset;
+ sp_repr_set_css_double (SP_OBJECT_REPR (stop), "offset", stop->offset);
+ stop = sp_next_stop(stop);
+ }
+ }
+ break;
+ case POINT_RG_CENTER:
+ {
+ SPStop *newfirst = sp_next_stop (stopinfo->spstop);
+ if (newfirst) {
+ newfirst->offset = 0;
+ sp_repr_set_css_double (SP_OBJECT_REPR (newfirst), "offset", 0);
+ }
+ SP_OBJECT_REPR(stopinfo->vector)->removeChild(SP_OBJECT_REPR(stopinfo->spstop));
+ }
+ break;
+ case POINT_RG_R1:
+ case POINT_RG_R2:
+ SP_OBJECT_REPR(stopinfo->vector)->removeChild(SP_OBJECT_REPR(stopinfo->spstop));
+
+ SPRadialGradient *rg = SP_RADIALGRADIENT(stopinfo->gradient);
+ double oldradius = rg->r.computed;
+ SPStop *laststop = sp_last_stop(stopinfo->vector);
+ gdouble offset = laststop->offset;
+ double newradius = offset * oldradius;
+ rg->r.computed = newradius;
+
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(rg);
+ sp_repr_set_svg_double(repr, "r", rg->r.computed);
+ laststop->offset = 1;
+ sp_repr_set_css_double (SP_OBJECT_REPR (laststop), "offset", 1);
+
+ // iterate through midstops to set new offset values such that they won't move on canvas.
+ SPStop *stop = sp_first_stop(stopinfo->vector);
+ stop = sp_next_stop(stop);
+ while ( stop != laststop ) {
+ stop->offset = stop->offset / offset;
+ sp_repr_set_css_double (SP_OBJECT_REPR (stop), "offset", stop->offset);
+ stop = sp_next_stop(stop);
+ }
+ break;
+ }
+ }
+ 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 ();
+
+ // 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 {
+ 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);
+ }
+
+ endstoplist = g_slist_remove(endstoplist, stopinfo);
+ delete stopinfo;
+ }
+
+ if (document) {
+ sp_document_done ( document, SP_VERB_CONTEXT_GRADIENT, _("Delete gradient stop(s)") );
}
}