diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index 1054a2c55850eca3d481cc513ac3ecf9acc80483..93e7e8470905f4c7ace2660ad4577b3b01d60b14 100644 (file)
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
*/
#include "config.h"
-#include "inkscape.h"
#include <gdk/gdkkeysyms.h>
#include <cstring>
#include "macros.h"
#include "display/sp-canvas.h"
-#include "display/snap-indicator.h"
#include "sp-rect.h"
#include "document.h"
#include "sp-namedview.h"
#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_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);
}
if (ec->shape_knot_holder) {
- sp_knot_holder_destroy(ec->shape_knot_holder);
+ delete ec->shape_knot_holder;
ec->shape_knot_holder = NULL;
}
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;
}
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();
}
}
@@ -281,10 +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);
-
- desktop->snapindicator->remove_snappoint();
+ event_context->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
gint ret = FALSE;
switch (event->type) {
@@ -304,22 +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;
- Inkscape::SnappedPoint s = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, button_dt, rc->item);
- rc->center = s.getPoint();
- if (s.getSnapped()) {
- desktop->snapindicator->set_new_snappoint(s);
- }
-
+ 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;
@@ -337,18 +333,10 @@ 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;
- Inkscape::SnappedPoint s = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, motion_dt, rc->item);
- motion_dt = s.getPoint();
- if (s.getSnapped()) {
- desktop->snapindicator->set_new_snappoint(s);
- }
-
- 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;
}
@@ -413,23 +401,10 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
}
break;
- case GDK_T:
- {
- Inkscape::Selection *selection = sp_desktop_selection (inkscape_active_desktop());
- SPItem *item = selection->singleItem();
- if (item && SP_IS_RECT (item)) {
- g_print ("Scaling transformation matrix\n");
- SP_RECT (item)->transform = NR::Matrix(NR::scale(1.25, 1.5));
- SP_OBJECT (item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
- }
- ret = TRUE;
- }
- break;
-
case GDK_g:
case GDK_G:
if (MOD__SHIFT_ONLY) {
- sp_selection_to_guides();
+ sp_selection_to_guides(desktop);
ret = true;
}
break;
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);
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
- double rdimx = r.dimensions()[NR::X];
- double rdimy = r.dimensions()[NR::Y];
+ 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) {