X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Farc-context.cpp;h=82c00fd05f05fe7ea2d028af895076ff6cefdfa0;hb=50eef40bd47ac82eca272808e2cb39614a2a9895;hp=c0f8dd75c73e09127a020fc9eee3b1911f4b40eb;hpb=dbe32b890d08ee7a085dcee01234f24e32db5ee1;p=inkscape.git
diff --git a/src/arc-context.cpp b/src/arc-context.cpp
index c0f8dd75c..82c00fd05 100644
--- a/src/arc-context.cpp
+++ b/src/arc-context.cpp
@@ -227,7 +227,7 @@ static gint sp_arc_context_item_handler(SPEventContext *event_context, SPItem *i
switch (event->type) {
case GDK_BUTTON_PRESS:
- if (event->button.button == 1) {
+ if (event->button.button == 1 && !event_context->space_panning) {
Inkscape::setup_for_drag_start(desktop, event_context, event);
ret = TRUE;
}
@@ -258,13 +258,14 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent
switch (event->type) {
case GDK_BUTTON_PRESS:
- if (event->button.button == 1) {
+ if (event->button.button == 1 && !event_context->space_panning) {
dragging = true;
ac->center = Inkscape::setup_for_drag_start(desktop, event_context, event);
- SnapManager const &m = desktop->namedview->snap_manager;
- ac->center = m.freeSnap(Inkscape::Snapper::SNAP_POINT, ac->center, ac->item).getPoint();
+ SnapManager const &m = desktop->namedview->snap_manager;
+ ac->center = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, ac->center, ac->item).getPoint();
+
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK,
@@ -273,7 +274,7 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent
}
break;
case GDK_MOTION_NOTIFY:
- if (dragging && event->motion.state && GDK_BUTTON1_MASK) {
+ if (dragging && (event->motion.state & GDK_BUTTON1_MASK) && !event_context->space_panning) {
if ( event_context->within_tolerance
&& ( abs( (gint) event->motion.x - event_context->xp ) < event_context->tolerance )
@@ -286,14 +287,21 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent
event_context->within_tolerance = false;
NR::Point const motion_w(event->motion.x, event->motion.y);
- NR::Point const motion_dt(desktop->w2d(motion_w));
+ NR::Point motion_dt(desktop->w2d(motion_w));
+
+ SnapManager const &m = desktop->namedview->snap_manager;
+ motion_dt = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, motion_dt, ac->item).getPoint();
+
sp_arc_drag(ac, motion_dt, event->motion.state);
+
+ gobble_motion_events(GDK_BUTTON1_MASK);
+
ret = TRUE;
}
break;
case GDK_BUTTON_RELEASE:
event_context->xp = event_context->yp = 0;
- if (event->button.button == 1) {
+ if (event->button.button == 1 && !event_context->space_panning) {
dragging = false;
if (!event_context->within_tolerance) {
// we've been dragging, finish the arc
@@ -351,6 +359,21 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent
case GDK_Escape:
sp_desktop_selection(desktop)->clear();
//TODO: make dragging escapable by Esc
+ break;
+
+ case GDK_space:
+ if (dragging) {
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+ event->button.time);
+ dragging = false;
+ if (!event_context->within_tolerance) {
+ // we've been dragging, finish the rect
+ sp_arc_finish(ac);
+ }
+ // do not return true, so that space would work switching to selector
+ }
+ break;
+
default:
break;
}
@@ -395,7 +418,8 @@ static void sp_arc_drag(SPArcContext *ac, NR::Point pt, guint state)
}
/* Create object */
- Inkscape::XML::Node *repr = sp_repr_new("svg:path");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
repr->setAttribute("sodipodi:type", "arc");
/* Set style */
@@ -409,15 +433,60 @@ static void sp_arc_drag(SPArcContext *ac, NR::Point pt, guint state)
sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5);
}
- NR::Rect const r = Inkscape::snap_rectangular_box(desktop, ac->item, pt, ac->center, state);
+ bool ctrl_save = false;
+ if ((state & GDK_MOD1_MASK) && (state & GDK_CONTROL_MASK) && !(state & GDK_SHIFT_MASK)) {
+ // if Alt is pressed without Shift in addition to Control, temporarily drop the CONTROL mask
+ // so that the ellipse is not constrained to integer ratios
+ ctrl_save = true;
+ state = state ^ GDK_CONTROL_MASK;
+ }
+ NR::Rect r = Inkscape::snap_rectangular_box(desktop, ac->item, pt, ac->center, state);
+ if (ctrl_save) {
+ state = state ^ GDK_CONTROL_MASK;
+ }
+
+ NR::Point dir = r.dimensions() / 2;
+ if (state & GDK_MOD1_MASK) {
+ /* With Alt let the ellipse pass through the mouse pointer */
+ NR::Point c = r.midpoint();
+ if (!ctrl_save) {
+ if (fabs(dir[NR::X]) > 1E-6 && fabs(dir[NR::Y]) > 1E-6) {
+ NR::Matrix const i2d (sp_item_i2d_affine (ac->item));
+ NR::Point new_dir = pt * i2d - c;
+ new_dir[NR::X] *= dir[NR::Y] / dir[NR::X];
+ double lambda = NR::L2(new_dir) / dir[NR::Y];
+ r = NR::Rect (c - lambda*dir, c + lambda*dir);
+ }
+ } else {
+ /* with Alt+Ctrl (without Shift) we generate a perfect circle
+ with diameter click point <--> mouse pointer */
+ double l = NR::L2 (dir);
+ NR::Point d = NR::Point (l, l);
+ r = NR::Rect (c - d, c + d);
+ }
+ }
sp_arc_position_set(SP_ARC(ac->item),
r.midpoint()[NR::X], r.midpoint()[NR::Y],
r.dimensions()[NR::X] / 2, r.dimensions()[NR::Y] / 2);
- GString *xs = SP_PX_TO_METRIC_STRING(r.dimensions()[NR::X], desktop->namedview->getDefaultMetric());
- GString *ys = SP_PX_TO_METRIC_STRING(r.dimensions()[NR::Y], desktop->namedview->getDefaultMetric());
- ac->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("Ellipse: %s × %s; with Ctrl to make circle or integer-ratio ellipse; with Shift to draw around the starting point"), xs->str, ys->str);
+ double rdimx = r.dimensions()[NR::X];
+ double rdimy = r.dimensions()[NR::Y];
+ GString *xs = SP_PX_TO_METRIC_STRING(rdimx, desktop->namedview->getDefaultMetric());
+ GString *ys = SP_PX_TO_METRIC_STRING(rdimy, desktop->namedview->getDefaultMetric());
+ if (state & GDK_CONTROL_MASK) {
+ int ratio_x, ratio_y;
+ if (fabs (rdimx) > fabs (rdimy)) {
+ ratio_x = (int) rint (rdimx / rdimy);
+ ratio_y = 1;
+ } else {
+ ratio_x = 1;
+ ratio_y = (int) rint (rdimy / rdimx);
+ }
+ ac->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Ellipse: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point"), xs->str, ys->str, ratio_x, ratio_y);
+ } else {
+ ac->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Ellipse: %s × %s; with Ctrl to make square or integer-ratio ellipse; with Shift to draw around the starting point"), xs->str, ys->str);
+ }
g_string_free(xs, FALSE);
g_string_free(ys, FALSE);
}