diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2012-05-03 06:51:21 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2012-05-03 06:51:21 +0000 |
| commit | 928e90577c43842f334fbe2361c45d92ed784dc3 (patch) | |
| tree | fb8e333b43058dab91e832a7a50a0b28dbe2bc18 /src | |
| parent | Eliminated duplication of GTK key defines. (diff) | |
| download | inkscape-928e90577c43842f334fbe2361c45d92ed784dc3.tar.gz inkscape-928e90577c43842f334fbe2361c45d92ed784dc3.zip | |
Corrected hardcoded hit detection in pen & pencil tool endpoint detection.
(bzr r11319)
Diffstat (limited to 'src')
| -rw-r--r-- | src/draw-anchor.cpp | 5 | ||||
| -rw-r--r-- | src/pen-context.cpp | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/draw-anchor.cpp b/src/draw-anchor.cpp index c9bc5485e..62a091608 100644 --- a/src/draw-anchor.cpp +++ b/src/draw-anchor.cpp @@ -71,8 +71,6 @@ SPDrawAnchor *sp_draw_anchor_destroy(SPDrawAnchor *anchor) return NULL; } -#define A_SNAP 4.0 - /** * Test if point is near anchor, if so fill anchor on canvas and return * pointer to it or NULL. @@ -80,8 +78,9 @@ SPDrawAnchor *sp_draw_anchor_destroy(SPDrawAnchor *anchor) SPDrawAnchor *sp_draw_anchor_test(SPDrawAnchor *anchor, Geom::Point w, gboolean activate) { SPDesktop *dt = SP_EVENT_CONTEXT_DESKTOP(anchor->dc); + SPCtrl *ctrl = SP_CTRL(anchor->ctrl); - if ( activate && ( Geom::LInfty( w - dt->d2w(anchor->dp) ) <= A_SNAP ) ) { + if ( activate && ( Geom::LInfty( w - dt->d2w(anchor->dp) ) <= (ctrl->box.width() / 2.0) ) ) { if (!anchor->active) { sp_canvas_item_set((GtkObject *) anchor->ctrl, "fill_color", FILL_COLOR_MOUSEOVER, NULL); anchor->active = TRUE; diff --git a/src/pen-context.cpp b/src/pen-context.cpp index b5d429914..731f31e42 100644 --- a/src/pen-context.cpp +++ b/src/pen-context.cpp @@ -228,10 +228,6 @@ static void sp_pen_context_setup(SPEventContext *ec) sp_canvas_item_hide(pc->cl0); sp_canvas_item_hide(pc->cl1); - if (pc->green_anchor) { - ControlManager::getManager().updateItem(pc->green_anchor->ctrl); - } - sp_event_context_read(ec, "mode"); pc->anchor_statusbar = false; @@ -511,9 +507,6 @@ static gint pen_handle_button_press(SPPenContext *const pc, GdkEventButton const p = event_dt; spdc_endpoint_snap(pc, p, bevent.state); pc->green_anchor = sp_draw_anchor_new(pc, pc->green_curve, TRUE, p); - { - ControlManager::getManager().updateItem(pc->green_anchor->ctrl); - } } spdc_pen_set_initial_point(pc, p); } else { |