X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fselect-context.cpp;h=606934ca6f3d9f451fb9854e19a1db9b94ef177e;hb=d1150228ea8064478ea50cd32e99d399b16455e3;hp=fd4e132e1798cb054553f5e483a14b881916c90e;hpb=0c488af786ad357b81b1b1de46cb792a1c4d0a18;p=inkscape.git diff --git a/src/select-context.cpp b/src/select-context.cpp index fd4e132e1..606934ca6 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -212,6 +212,7 @@ sp_select_context_abort(SPEventContext *event_context) seltrans->ungrab(); sc->moved = FALSE; sc->dragging = FALSE; + sp_event_context_discard_delayed_snap_event(event_context); drag_escaped = 1; if (sc->item) { @@ -408,11 +409,6 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) Inkscape::Selection *selection = sp_desktop_selection(desktop); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - gdouble const nudge = prefs->getDoubleLimited("/options/nudgedistance/value", 2, 0, 1000); // in px - gdouble const offset = prefs->getDoubleLimited("/options/defaultscale/value", 2, 0, 1000); - tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); - int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12); - // make sure we still have valid objects to move around if (sc->item && SP_OBJECT_DOCUMENT( SP_OBJECT(sc->item))==NULL) { sp_select_context_abort(event_context); @@ -427,10 +423,13 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) desktop->setCurrentLayer(reinterpret_cast(clicked_item)); sp_desktop_selection(desktop)->clear(); sc->dragging = false; + sp_event_context_discard_delayed_snap_event(event_context); sp_canvas_end_forced_full_redraws(desktop->canvas); } else { // switch tool - tools_switch_by_item (desktop, clicked_item); + Geom::Point const button_pt(event->button.x, event->button.y); + Geom::Point const p(desktop->w2d(button_pt)); + tools_switch_by_item (desktop, clicked_item, p); } } else { sp_select_context_up_one_layer(desktop); @@ -477,7 +476,8 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) break; case GDK_MOTION_NOTIFY: - if (event->motion.state & GDK_BUTTON1_MASK && !event_context->space_panning) { + tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); + if (event->motion.state & GDK_BUTTON1_MASK && !event_context->space_panning) { Geom::Point const motion_pt(event->motion.x, event->motion.y); Geom::Point const p(desktop->w2d(motion_pt)); @@ -494,7 +494,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (sc->button_press_ctrl || (sc->button_press_alt && !sc->button_press_shift && !selection->isEmpty())) { // if it's not click and ctrl or alt was pressed (the latter with some selection // but not with shift) we want to drag rather than rubberband - sc->dragging = TRUE; + sc->dragging = TRUE; sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5); } @@ -513,6 +513,8 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (!sc->moved) { item_in_group = desktop->item_at_point(Geom::Point(event->button.x, event->button.y), TRUE); group_at_point = desktop->group_at_point(Geom::Point(event->button.x, event->button.y)); + if (SP_IS_LAYER(selection->single())) + group_at_point = SP_GROUP(selection->single()); // group-at-point is meant to be topmost item if it's a group, // not topmost group of all items at point @@ -533,7 +535,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (item_at_point && !selection->includes(item_at_point)) selection->set(item_at_point); } // otherwise, do not change selection so that dragging selected-within-group items, as well as alt-dragging, is possible - seltrans->grab(p, -1, -1, FALSE); + seltrans->grab(p, -1, -1, FALSE, TRUE); sc->moved = TRUE; } if (!seltrans->isEmpty()) @@ -543,7 +545,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) ret = TRUE; } else { sc->dragging = FALSE; - + sp_event_context_discard_delayed_snap_event(event_context); sp_canvas_end_forced_full_redraws(desktop->canvas); } } else { @@ -575,9 +577,12 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) seltrans->resetState(); selection->toggle(sc->item); } else { + SPObject* single = selection->single(); // without shift, increase state (i.e. toggle scale/rotation handles) if (selection->includes(sc->item)) { seltrans->increaseState(); + } else if (SP_IS_LAYER(single) && single->isAncestorOf(sc->item)) { + seltrans->increaseState(); } else { seltrans->resetState(); selection->set(sc->item); @@ -589,7 +594,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } } sc->dragging = FALSE; - + sp_event_context_discard_delayed_snap_event(event_context); sp_canvas_end_forced_full_redraws(desktop->canvas); if (sc->item) { @@ -689,8 +694,9 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) case GDK_KEY_PRESS: // keybindings for select context - { - guint keyval = get_group0_keyval(&event->key); + { + { + guint keyval = get_group0_keyval(&event->key); bool alt = ( MOD__ALT || (keyval == GDK_Alt_L) || (keyval == GDK_Alt_R) @@ -724,9 +730,13 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) //*/ break; } - } + } - switch (get_group0_keyval (&event->key)) { + gdouble const nudge = prefs->getDoubleLimited("/options/nudgedistance/value", 2, 0, 1000); // in px + gdouble const offset = prefs->getDoubleLimited("/options/defaultscale/value", 2, 0, 1000); + int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12); + + switch (get_group0_keyval (&event->key)) { case GDK_Left: // move selection left case GDK_KP_Left: case GDK_KP_4: @@ -917,7 +927,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) break; } break; - + } case GDK_KEY_RELEASE: { guint keyval = get_group0_keyval(&event->key); @@ -938,8 +948,9 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } } // set cursor to default. - if (!desktop->isWaitingCursor()) + if (!desktop->isWaitingCursor()) { gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); + } break; default: break;