X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fgradient-drag.cpp;h=6c960ed280da584f4ae0fb17466fe87ceca3324e;hb=07916b4c23e70df45383ea8348cf817c1d029083;hp=ff15e8b8e8382370bf2e206ed19961f760701368;hpb=a45fd54bff019fff6991b5c964fc43c2f3098cda;p=inkscape.git diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp index ff15e8b8e..6c960ed28 100644 --- a/src/gradient-drag.cpp +++ b/src/gradient-drag.cpp @@ -18,6 +18,8 @@ #endif #include +#include +#include #include "desktop-handles.h" #include "selection.h" @@ -41,6 +43,7 @@ #include "snap.h" #include "sp-namedview.h" #include "selection-chemistry.h" +#include "display/snap-indicator.h" #define GR_KNOT_COLOR_NORMAL 0xffffff00 @@ -82,16 +85,16 @@ const gchar *gr_knot_descr [] = { }; static void -gr_drag_sel_changed(Inkscape::Selection *selection, gpointer data) +gr_drag_sel_changed(Inkscape::Selection */*selection*/, gpointer data) { - GrDrag *drag = (GrDrag *) data; - drag->updateDraggers (); - drag->updateLines (); - drag->updateLevels (); + GrDrag *drag = (GrDrag *) data; + drag->updateDraggers (); + drag->updateLines (); + drag->updateLevels (); } static void -gr_drag_sel_modified (Inkscape::Selection *selection, guint flags, gpointer data) +gr_drag_sel_modified (Inkscape::Selection */*selection*/, guint /*flags*/, gpointer data) { GrDrag *drag = (GrDrag *) data; if (drag->local_change) { @@ -246,11 +249,9 @@ gr_drag_style_set (const SPCSSAttr *css, gpointer data) return true; } -bool -GrDrag::copy() +guint32 GrDrag::getColor() { - if (!selected) - return false; + if (!selected) return 0; float cf[4]; cf[0] = cf[1] = cf[2] = cf[3] = 0; @@ -279,28 +280,7 @@ GrDrag::copy() cf[3] /= count; } - guint32 const c32 = SP_RGBA32_F_COMPOSE(cf[0], cf[1], cf[2], cf[3]); - gchar c[64]; - - SPCSSAttr *css = sp_repr_css_attr_new (); - g_snprintf(c, 64, "#%06x", c32 >> 8); - sp_repr_css_set_property (css, "fill", c); - Inkscape::CSSOStringStream os; - os << cf[3]; - sp_repr_css_set_property (css, "opacity", os.str().c_str()); - sp_set_style_clipboard (css); - - g_snprintf(c, 64, "%06x%02x", c32 >> 8, c32 & 0x000000ff); - Glib::ustring text; - text += c; - if (!text.empty()) - { - Glib::RefPtr refClipboard = - Gtk::Clipboard::get(); - refClipboard->set_text(text); - } - - return true; + return SP_RGBA32_F_COMPOSE(cf[0], cf[1], cf[2], cf[3]); } SPStop * @@ -372,14 +352,14 @@ GrDrag::addStopNearPoint (SPItem *item, NR::Point mouse_p, double tolerance) updateDraggers(); return newstop; - } + } return NULL; } -bool -GrDrag::dropColor(SPItem *item, gchar *c, NR::Point p) +bool +GrDrag::dropColor(SPItem */*item*/, gchar *c, NR::Point p) { // first, see if we can drop onto one of the existing draggers for (GList *i = draggers; i != NULL; i = i->next) { // for all draggables of dragger @@ -549,6 +529,8 @@ gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpoi // FIXME: take from prefs double snap_dist = SNAP_DIST / dragger->parent->desktop->current_zoom(); + dragger->parent->desktop->snapindicator->remove_snappoint(); + if (state & GDK_SHIFT_MASK) { // with Shift; unsnap if we carry more than one draggable if (dragger->draggables && dragger->draggables->next) { @@ -605,20 +587,30 @@ gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpoi if (s.getDistance() < 1e6) { p = s.getPoint(); sp_knot_moveto (knot, &p); + dragger->parent->desktop->snapindicator->set_new_snappoint(p.to_2geom()); } else { + bool was_snapped = false; + Geom::Point snapped_to; // 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]; + snapped_to = p.to_2geom(); + was_snapped = true; 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]; + snapped_to = p.to_2geom(); + was_snapped = true; sp_knot_moveto (knot, &p); } } + if (was_snapped) { + dragger->parent->desktop->snapindicator->set_new_snappoint(snapped_to); + } } } @@ -766,14 +758,14 @@ gr_midpoint_limits(GrDragger *dragger, SPObject *server, NR::Point *begin, NR::P } else { d_temp = drag->getDraggerFor (draggable->item, POINT_LG_MID, lowest_i - 1, draggable->fill_or_stroke); } - if (d_temp) + 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, num-1, draggable->fill_or_stroke); } - if (d_temp) + if (d_temp) *end = d_temp->point; } else if ( SP_IS_RADIALGRADIENT(server) ) { guint num = SP_RADIALGRADIENT(server)->vector.stops.size(); @@ -783,14 +775,14 @@ gr_midpoint_limits(GrDragger *dragger, SPObject *server, NR::Point *begin, NR::P } else { d_temp = drag->getDraggerFor (draggable->item, draggable->point_type, lowest_i - 1, draggable->fill_or_stroke); } - if (d_temp) + 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, num-1, draggable->fill_or_stroke); } - if (d_temp) + if (d_temp) *end = d_temp->point; } @@ -804,7 +796,7 @@ gr_midpoint_limits(GrDragger *dragger, SPObject *server, NR::Point *begin, NR::P Called when a midpoint knot is dragged. */ static void -gr_knot_moved_midpoint_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpointer data) +gr_knot_moved_midpoint_handler(SPKnot */*knot*/, NR::Point const *ppointer, guint state, gpointer data) { GrDragger *dragger = (GrDragger *) data; GrDrag *drag = dragger->parent; @@ -836,7 +828,7 @@ gr_knot_moved_midpoint_handler(SPKnot *knot, NR::Point const *ppointer, guint st NR::Point this_move = displacement; if (state & GDK_MOD1_MASK) { // FIXME: unify all these profiles (here, in nodepath, in tweak) in one place - double alpha = 1.5; + double alpha = 1.0; if (NR::L2(drg->point - dragger->point) + NR::L2(drg->point - begin) - 1e-3 > NR::L2(dragger->point - begin)) { // drg is on the end side from dragger double x = NR::L2(drg->point - dragger->point)/NR::L2(end - dragger->point); this_move = (0.5 * cos (M_PI * (pow(x, alpha))) + 0.5) * this_move; @@ -859,7 +851,7 @@ gr_knot_moved_midpoint_handler(SPKnot *knot, NR::Point const *ppointer, guint st static void -gr_knot_grabbed_handler (SPKnot *knot, unsigned int state, gpointer data) +gr_knot_grabbed_handler (SPKnot */*knot*/, unsigned int /*state*/, gpointer data) { GrDragger *dragger = (GrDragger *) data; @@ -909,7 +901,7 @@ Called when a dragger knot is clicked; selects the dragger or deletes it dependi state of the keyboard keys */ static void -gr_knot_clicked_handler(SPKnot *knot, guint state, gpointer data) +gr_knot_clicked_handler(SPKnot */*knot*/, guint state, gpointer data) { GrDragger *dragger = (GrDragger *) data; GrDraggable *draggable = (GrDraggable *) dragger->draggables->data; @@ -972,7 +964,7 @@ gr_knot_clicked_handler(SPKnot *knot, guint state, gpointer data) Called when a dragger knot is doubleclicked; opens gradient editor with the stop from the first draggable */ static void -gr_knot_doubleclicked_handler (SPKnot *knot, guint state, gpointer data) +gr_knot_doubleclicked_handler (SPKnot */*knot*/, guint /*state*/, gpointer data) { GrDragger *dragger = (GrDragger *) data; @@ -1181,7 +1173,7 @@ GrDragger::moveThisToDraggable (SPItem *item, gint point_type, gint point_i, boo for (GSList const* i = this->draggables; i != NULL; i = i->next) { GrDraggable *da = (GrDraggable *) i->data; - if ( (da->item == item) && + if ( (da->item == item) && (point_type == -1 || da->point_type == point_type) && (point_i == -1 || da->point_i == point_i) && (da->fill_or_stroke == fill_or_stroke) ) { @@ -1199,7 +1191,7 @@ Moves all midstop draggables that depend on this one void GrDragger::updateMidstopDependencies (GrDraggable *draggable, bool write_repr) { SPObject *server = draggable->getServer(); - if (!server) + if (!server) return; guint num = SP_GRADIENT(server)->vector.stops.size(); if (num <= 2) return; @@ -1353,7 +1345,7 @@ GrDrag::getDraggerFor (SPItem *item, gint point_type, gint point_i, bool fill_or 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) && + if ( (da2->item == item) && (point_type == -1 || da2->point_type == point_type) && // -1 means this does not matter (point_i == -1 || da2->point_i == point_i) && // -1 means this does not matter (da2->fill_or_stroke == fill_or_stroke)) { @@ -1438,7 +1430,7 @@ GrDrag::selectAll() /** \brief Select all stops/draggers that match the coords */ -void +void GrDrag::selectByCoords(std::vector coords) { for (GList *l = this->draggers; l != NULL; l = l->next) { @@ -1455,7 +1447,7 @@ GrDrag::selectByCoords(std::vector coords) /** \brief Select all stops/draggers that fall within the rect */ -void +void GrDrag::selectRect(NR::Rect const &r) { for (GList *l = this->draggers; l != NULL; l = l->next) { @@ -1770,7 +1762,7 @@ GrDrag::selected_move (double x, double y, bool write_repr, bool scale_radial) if (selected == NULL) return; - bool did = false; + bool did = false; for (GList *i = selected; i != NULL; i = i->next) { GrDragger *d = (GrDragger *) i->data; @@ -1781,7 +1773,7 @@ GrDrag::selected_move (double x, double y, bool write_repr, bool scale_radial) // Moving an rg center moves its focus and radii as well. // therefore, if this is a focus or radius and if selection // contains the center as well, do not move this one - if (d->isA(POINT_RG_R1) || d->isA(POINT_RG_R2) || + if (d->isA(POINT_RG_R1) || d->isA(POINT_RG_R2) || (d->isA(POINT_RG_FOCUS) && !d->isA(POINT_RG_CENTER))) { bool skip_radius_with_center = false; for (GList *di = selected; di != NULL; di = di->next) { @@ -1871,7 +1863,7 @@ GrDrag::select_next () { GrDragger *d = NULL; if (selected == NULL || g_list_find(draggers, selected->data)->next == NULL) { - if (draggers) + if (draggers) d = (GrDragger *) draggers->data; } else { d = (GrDragger *) g_list_find(draggers, selected->data)->next->data; @@ -2126,7 +2118,7 @@ GrDrag::deleteSelected (bool just_one) } sp_repr_css_attr_unref (stopcss); } - + sp_repr_css_change (SP_OBJECT_REPR (stopinfo->draggable->item), css, "style"); sp_repr_css_attr_unref (css); }