X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Frect-context.cpp;h=93e7e8470905f4c7ace2660ad4577b3b01d60b14;hb=7b51296159813ffbc382e4decef735f222ee23f8;hp=71683ec8ead8105d530b642797925c8c9f95f0e8;hpb=9b64c78f3873403775d80ce62fcec325a92a62a7;p=inkscape.git diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 71683ec8e..93e7e8470 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -17,6 +17,8 @@ #include "config.h" #include +#include +#include #include "macros.h" #include "display/sp-canvas.h" @@ -24,6 +26,7 @@ #include "document.h" #include "sp-namedview.h" #include "selection.h" +#include "selection-chemistry.h" #include "desktop-handles.h" #include "snap.h" #include "desktop.h" @@ -36,15 +39,17 @@ #include "object-edit.h" #include "xml/repr.h" #include "xml/node-event-vector.h" -#include "prefs-utils.h" +#include "preferences.h" #include "context-fns.h" +//static const double goldenratio = 1.61803398874989484820; // golden ratio + static void sp_rect_context_class_init(SPRectContextClass *klass); static void sp_rect_context_init(SPRectContext *rect_context); static void sp_rect_context_dispose(GObject *object); static void sp_rect_context_setup(SPEventContext *ec); -static void sp_rect_context_set(SPEventContext *ec, gchar const *key, gchar const *val); +static void sp_rect_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val); static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent *event); static gint sp_rect_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event); @@ -129,7 +134,7 @@ static void sp_rect_context_dispose(GObject *object) } if (ec->shape_knot_holder) { - sp_knot_holder_destroy(ec->shape_knot_holder); + delete ec->shape_knot_holder; ec->shape_knot_holder = NULL; } @@ -164,7 +169,7 @@ void sp_rect_context_selection_changed(Inkscape::Selection *selection, gpointer SPEventContext *ec = SP_EVENT_CONTEXT(rc); if (ec->shape_knot_holder) { // destroy knotholder - sp_knot_holder_destroy(ec->shape_knot_holder); + delete ec->shape_knot_holder; ec->shape_knot_holder = NULL; } @@ -213,31 +218,29 @@ static void sp_rect_context_setup(SPEventContext *ec) sp_event_context_read(ec, "rx"); sp_event_context_read(ec, "ry"); - if (prefs_get_int_attribute("tools.shapes", "selcue", 0) != 0) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + if (prefs->getBool("/tools/shapes/selcue")) { ec->enableSelectionCue(); } - if (prefs_get_int_attribute("tools.shapes", "gradientdrag", 0) != 0) { + if (prefs->getBool("/tools/shapes/gradientdrag")) { ec->enableGrDrag(); } rc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); } -static void sp_rect_context_set(SPEventContext *ec, gchar const *key, gchar const *val) +static void sp_rect_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val) { SPRectContext *rc = SP_RECT_CONTEXT(ec); /* fixme: Proper error handling for non-numeric data. Use a locale-independent function like * g_ascii_strtod (or a thin wrapper that does the right thing for invalid values inf/nan). */ - if ( strcmp(key, "rx") == 0 ) { - rc->rx = ( val - ? g_ascii_strtod (val, NULL) - : 0.0 ); - } else if ( strcmp(key, "ry") == 0 ) { - rc->ry = ( val - ? g_ascii_strtod (val, NULL) - : 0.0 ); + Glib::ustring name = val->getEntryName(); + if ( name == "rx" ) { + rc->rx = val->getDoubleLimited(); // prevents NaN and +/-Inf from messing up + } else if ( name == "ry" ) { + rc->ry = val->getDoubleLimited(); } } @@ -274,8 +277,9 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent Inkscape::Selection *selection = sp_desktop_selection (desktop); SPRectContext *rc = SP_RECT_CONTEXT(event_context); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - event_context->tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100); + event_context->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); gint ret = FALSE; switch (event->type) { @@ -295,19 +299,23 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent dragging = true; /* Position center */ - NR::Point const button_dt(desktop->w2d(button_w)); - + Geom::Point button_dt(desktop->w2d(button_w)); + rc->center = from_2geom(button_dt); + /* Snap center */ - SnapManager const &m = desktop->namedview->snap_manager; - rc->center = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, - button_dt, rc->item).getPoint(); - + SnapManager &m = desktop->namedview->snap_manager; + m.setup(desktop); + m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, button_dt); + rc->center = from_2geom(button_dt); + sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), ( GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK ), NULL, event->button.time); + ret = TRUE; } break; @@ -325,15 +333,11 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent // motion notify coordinates as given (no snapping back to origin) event_context->within_tolerance = false; - NR::Point const motion_w(event->motion.x, - event->motion.y); + NR::Point const motion_w(event->motion.x, event->motion.y); 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, rc->item).getPoint(); - - sp_rect_drag(*rc, motion_dt, event->motion.state); - + sp_rect_drag(*rc, motion_dt, event->motion.state); // this will also handle the snapping + gobble_motion_events(GDK_BUTTON1_MASK); ret = TRUE; } break; @@ -397,6 +401,14 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent } break; + case GDK_g: + case GDK_G: + if (MOD__SHIFT_ONLY) { + sp_selection_to_guides(desktop); + ret = true; + } + break; + case GDK_Escape: sp_desktop_selection(desktop)->clear(); //TODO: make dragging escapable by Esc @@ -463,7 +475,7 @@ static void sp_rect_drag(SPRectContext &rc, NR::Point const pt, guint state) Inkscape::XML::Node *repr = xml_doc->createElement("svg:rect"); /* Set style */ - sp_desktop_apply_style_tool (desktop, repr, "tools.shapes.rect", false); + sp_desktop_apply_style_tool (desktop, repr, "/tools/shapes/rect", false); rc.item = (SPItem *) desktop->currentLayer()->appendChildRepr(repr); Inkscape::GC::release(repr); @@ -473,23 +485,52 @@ static void sp_rect_drag(SPRectContext &rc, NR::Point const pt, guint state) sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5); } - NR::Rect const r = Inkscape::snap_rectangular_box(desktop, rc.item, pt, rc.center, state); + Geom::Rect const r = Inkscape::snap_rectangular_box(desktop, rc.item, pt, rc.center, state); - sp_rect_position_set(SP_RECT(rc.item), r.min()[NR::X], r.min()[NR::Y], r.dimensions()[NR::X], r.dimensions()[NR::Y]); + sp_rect_position_set(SP_RECT(rc.item), r.min()[Geom::X], r.min()[Geom::Y], r.dimensions()[Geom::X], r.dimensions()[Geom::Y]); if ( rc.rx != 0.0 ) { sp_rect_set_rx (SP_RECT(rc.item), TRUE, rc.rx); } if ( rc.ry != 0.0 ) { if (rc.rx == 0.0) - sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, MIN(r.dimensions()[NR::X], r.dimensions()[NR::Y])/2)); + sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, MIN(r.dimensions()[Geom::X], r.dimensions()[Geom::Y])/2)); else - sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, r.dimensions()[NR::Y])); + sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, r.dimensions()[Geom::Y])); } // status text - 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()); - rc._message_context->setF(Inkscape::NORMAL_MESSAGE, _("Rectangle: %s × %s; with Ctrl to make square or integer-ratio rectangle; with Shift to draw around the starting point"), xs->str, ys->str); + double rdimx = r.dimensions()[Geom::X]; + double rdimy = r.dimensions()[Geom::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; + bool is_golden_ratio = false; + if (fabs (rdimx) > fabs (rdimy)) { + if (fabs(rdimx / rdimy - goldenratio) < 1e-6) { + is_golden_ratio = true; + } + ratio_x = (int) rint (rdimx / rdimy); + ratio_y = 1; + } else { + if (fabs(rdimy / rdimx - goldenratio) < 1e-6) { + is_golden_ratio = true; + } + ratio_x = 1; + ratio_y = (int) rint (rdimy / rdimx); + } + if (!is_golden_ratio) { + rc._message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point"), xs->str, ys->str, ratio_x, ratio_y); + } else { + if (ratio_y == 1) { + rc._message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to golden ratio 1.618 : 1); with Shift to draw around the starting point"), xs->str, ys->str); + } else { + rc._message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to golden ratio 1 : 1.618); with Shift to draw around the starting point"), xs->str, ys->str); + } + } + } else { + rc._message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s; with Ctrl to make square or integer-ratio rectangle; with Shift to draw around the starting point"), xs->str, ys->str); + } g_string_free(xs, FALSE); g_string_free(ys, FALSE); }