![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a362b28)
raw | patch | inline | side by side (parent: a362b28)
| author | cilix42 <cilix42@users.sourceforge.net> | |
| Thu, 16 Jul 2009 14:55:16 +0000 (14:55 +0000) | ||
| committer | cilix42 <cilix42@users.sourceforge.net> | |
| Thu, 16 Jul 2009 14:55:16 +0000 (14:55 +0000) |
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index cc2d493307eeedf26b6910ab6db1b9866f4e2efb..d8fb9d8d5155bfaae2ece3f5da575dd7a980f88d 100644 (file)
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
return sp_event_context_root_handler(desktop->event_context, event);
}
-
static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw, bool horiz)
{
static bool dragging = false;
@@ -89,17 +88,20 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
if (event->button.button == 1) {
dragging = true;
- // FIXME: The snap delay mechanism won't work here, because it has been implemented for the event context. Dragging
- // guides off the ruler will send event to the ruler and not to the context, which bypasses sp_event_context_snap_delay_handler
- // The snap manager will not notice the difference, so it'll check if the snap delay has been activated (This check
- // is only needed for catching coding errors, i.e. to warn if the snap window has not been implemented properly
- // in some context)
+ // FIXME: The snap delay mechanism won't work here, because it has been implemented
+ // for the event context. Dragging guides off the ruler will send event to the ruler
+ // and not to the context, which bypasses sp_event_context_snap_delay_handler
+ // The snap manager will not notice the difference, so it'll check if the snap delay
+ // has been activated (This check is only needed for catching coding errors, i.e.
+ // to warn if the snap window has not been implemented properly in some context)
if (desktop->event_context->_snap_window_open == false) {
- // A dt_ruler_event might be emitted when dragging a guide off the rulers while drawing a Bezier curve
- // In such a situation, we're already in that specific context and the snap delay is already active. We should
- // not set the snap delay to active again, because that will trigger a similar warning to the one above
- sp_event_context_snap_window_open(desktop->event_context);
- snap_window_temporarily_open = true;
+ // A dt_ruler_event might be emitted when dragging a guide off the rulers
+ // while drawing a Bezier curve. In such a situation, we're already in that
+ // specific context and the snap delay is already active. We should not set
+ // the snap delay to active again, because that will trigger a similar warning
+ // to the one above
+ sp_event_context_snap_window_open(desktop->event_context);
+ snap_window_temporarily_open = true;
}
Geom::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
@@ -159,8 +161,9 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop);
- // We only have a temporary guide which is not stored in our document yet. Because the guide snapper only looks
- // in the document for guides to snap to, we don't have to worry about a guide snapping to itself here
+ // We only have a temporary guide which is not stored in our document yet.
+ // Because the guide snapper only looks in the document for guides to snap to,
+ // we don't have to worry about a guide snapping to itself here
m.guideFreeSnap(event_dt, normal);
sp_guideline_set_position(SP_GUIDELINE(guide), from_2geom(event_dt));
@@ -176,8 +179,9 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop);
- // We only have a temporary guide which is not stored in our document yet. Because the guide snapper only looks
- // in the document for guides to snap to, we don't have to worry about a guide snapping to itself here
+ // We only have a temporary guide which is not stored in our document yet.
+ // Because the guide snapper only looks in the document for guides to snap to,
+ // we don't have to worry about a guide snapping to itself here
m.guideFreeSnap(event_dt, normal);
dragging = false;
@@ -202,11 +206,13 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
}
desktop->set_coordinate_status(from_2geom(event_dt));
- // A dt_ruler_event might be emitted when dragging a guide of the rulers while drawing a Bezier curve
- // In such a situation, we're already in that specific context and the snap delay is already active. We should
- // interfere with that context and we should therefore leave the snap delay status as it is. So although it might
- // have been set to active above on GDK_BUTTON_PRESS, we should not set it back to inactive here. That must be
- // done by the context
+ // A dt_ruler_event might be emitted when dragging a guide of the rulers
+ // while drawing a Bezier curve. In such a situation, we're already in that
+ // specific context and the snap delay is already active. We should interfere
+ // with that context and we should therefore leave the snap delay status
+ // as it is. So although it might have been set to active above on
+ // GDK_BUTTON_PRESS, we should not set it back to inactive here. That must be
+ // done by the context.
}
default:
break;
static Geom::Point drag_origin;
static SPGuideDragType drag_type = SP_DRAG_NONE;
+//static bool reset_drag_origin = false; // when Ctrl is pressed while dragging, this is used to trigger resetting of the
+// // drag origin to that location so that constrained movement is more intuitive
// Min distance from anchor to initiate rotation, measured in screenpixels
#define tol 40.0
break;
case GDK_BUTTON_PRESS:
if (event->button.button == 1) {
- if (event->button.state & GDK_CONTROL_MASK && !(event->button.state & GDK_SHIFT_MASK)) {
- SPDocument *doc = SP_OBJECT_DOCUMENT(guide);
- sp_guide_remove(guide);
- sp_document_done(doc, SP_VERB_NONE, _("Delete guide"));
- ret = TRUE;
- break;
- }
-
sp_event_context_snap_window_open(desktop->event_context);
Geom::Point const event_w(event->button.x, event->button.y);
Geom::Point const event_dt(desktop->w2d(event_w));
// https://bugs.launchpad.net/inkscape/+bug/333762
drag_origin = Geom::projection(event_dt, Geom::Line(guide->point_on_line, guide->angle()));
- if (Geom::L2(guide->point_on_line - event_dt) < tol/desktop->current_zoom()) {
- // the click was on the guide 'anchor'
- drag_type = (event->button.state & GDK_SHIFT_MASK) ? SP_DRAG_MOVE_ORIGIN : SP_DRAG_TRANSLATE;
+ if (event->button.state & GDK_SHIFT_MASK) {
+ // with shift we rotate the guide
+ drag_type = SP_DRAG_ROTATE;
} else {
- drag_type = (event->button.state & GDK_SHIFT_MASK) ? SP_DRAG_ROTATE : SP_DRAG_TRANSLATE;
+ if (event->button.state & GDK_CONTROL_MASK) {
+ drag_type = SP_DRAG_MOVE_ORIGIN;
+ } else {
+ drag_type = SP_DRAG_TRANSLATE;
+ }
+ }
+
+ if (drag_type == SP_DRAG_ROTATE || drag_type == SP_DRAG_TRANSLATE) {
sp_canvas_item_grab(item,
( GDK_BUTTON_RELEASE_MASK |
GDK_BUTTON_PRESS_MASK |
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop, true, NULL, NULL, guide);
if (drag_type == SP_DRAG_MOVE_ORIGIN) {
- // If we snap in guideConstrainedSnap() below, then motion_dt will be forced to be on the guide
- // If we don't snap however, then it the origin should still be constrained to the guide
- // So let's do that explicitly first:
- Geom::Line line(guide->point_on_line, guide->angle());
- Geom::Coord t = line.nearestPoint(motion_dt);
- motion_dt = line.pointAt(t);
- m.guideConstrainedSnap(motion_dt, *guide);
+ // If we snap in guideConstrainedSnap() below, then motion_dt will
+ // be forced to be on the guide. If we don't snap however, then
+ // the origin should still be constrained to the guide. So let's do
+ // that explicitly first:
+
+ Geom::Line line(guide->point_on_line, guide->angle());
+ Geom::Coord t = line.nearestPoint(motion_dt);
+ motion_dt = line.pointAt(t);
+ m.guideConstrainedSnap(motion_dt, *guide);
} else {
- m.guideFreeSnap(motion_dt, guide->normal_to_line);
+ m.guideFreeSnap(motion_dt, guide->normal_to_line);
}
switch (drag_type) {
case SP_DRAG_TRANSLATE:
{
- sp_guide_moveto(*guide, guide->point_on_line + motion_dt - drag_origin, false);
+ sp_guide_moveto(*guide, motion_dt, false);
break;
}
case SP_DRAG_TRANSLATE_CONSTRAINED: // Is not being used currently!
}
case SP_DRAG_ROTATE:
{
- double angle = angle_between(drag_origin - guide->point_on_line, motion_dt - guide->point_on_line);
+ Geom::Point pt = motion_dt - guide->point_on_line;
+ double angle = std::atan2(pt[Geom::Y], pt[Geom::X]);
if (event->motion.state & GDK_CONTROL_MASK) {
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
unsigned const snaps = abs(prefs->getInt("/options/rotationsnapsperpi/value", 12));
angle = (M_PI / snaps) * sections;
}
}
- sp_guide_set_normal(*guide, guide->normal_to_line * Geom::Rotate(angle), false);
+ sp_guide_set_normal(*guide, Geom::Point(1,0) * Geom::Rotate(angle + M_PI_2), false);
break;
}
case SP_DRAG_MOVE_ORIGIN:
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop, true, NULL, NULL, guide);
if (drag_type == SP_DRAG_MOVE_ORIGIN) {
- // If we snap in guideConstrainedSnap() below, then motion_dt will be forced to be on the guide
- // If we don't snap however, then it the origin should still be constrained to the guide
- // So let's do that explicitly first:
+ // If we snap in guideConstrainedSnap() below, then motion_dt will
+ // be forced to be on the guide. If we don't snap however, then
+ // the origin should still be constrained to the guide. So let's
+ // do that explicitly first:
Geom::Line line(guide->point_on_line, guide->angle());
- Geom::Coord t = line.nearestPoint(event_dt);
- event_dt = line.pointAt(t);
+ Geom::Coord t = line.nearestPoint(event_dt);
+ event_dt = line.pointAt(t);
m.guideConstrainedSnap(event_dt, *guide);
- } else {
- m.guideFreeSnap(event_dt, guide->normal_to_line);
- }
+ } else {
+ m.guideFreeSnap(event_dt, guide->normal_to_line);
+ }
if (sp_canvas_world_pt_inside_window(item->canvas, event_w)) {
switch (drag_type) {
case SP_DRAG_TRANSLATE:
{
- sp_guide_moveto(*guide, guide->point_on_line + event_dt - drag_origin, true);
+ sp_guide_moveto(*guide, event_dt, true);
break;
}
case SP_DRAG_TRANSLATE_CONSTRAINED: // Is not being used currently!
}
case SP_DRAG_ROTATE:
{
- double angle = angle_between(drag_origin - guide->point_on_line, event_dt - guide->point_on_line);
+ Geom::Point pt = event_dt - guide->point_on_line;
+ double angle = std::atan2(pt[Geom::Y], pt[Geom::X]);
if (event->motion.state & GDK_CONTROL_MASK) {
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
unsigned const snaps = abs(prefs->getInt("/options/rotationsnapsperpi/value", 12));
angle = (M_PI / snaps) * sections;
}
}
- sp_guide_set_normal(*guide, guide->normal_to_line * Geom::Rotate(angle), true);
+ sp_guide_set_normal(*guide, Geom::Point(1,0) * Geom::Rotate(angle + M_PI_2), true);
break;
}
case SP_DRAG_MOVE_ORIGIN:
Geom::Point const event_w(event->crossing.x, event->crossing.y);
Geom::Point const event_dt(desktop->w2d(event_w));
- GdkCursor *guide_cursor;
- if (Geom::L2(guide->point_on_line - event_dt) < tol/desktop->current_zoom() || !(event->crossing.state & GDK_SHIFT_MASK)) {
- // the click was on the guide 'anchor'
- guide_cursor = gdk_cursor_new (GDK_FLEUR);
- } else {
+ if (event->crossing.state & GDK_SHIFT_MASK) {
+ GdkCursor *guide_cursor;
guide_cursor = gdk_cursor_new (GDK_EXCHANGE);
+ gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, guide_cursor);
+ gdk_cursor_unref(guide_cursor);
}
- gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, guide_cursor);
char *guide_description = sp_guide_description(guide);
desktop->guidesMessageContext()->setF(Inkscape::NORMAL_MESSAGE, _("<b>Guideline</b>: %s"), guide_description);
desktop->guidesMessageContext()->clear();
break;
- default:
+ case GDK_KEY_PRESS:
+ switch (get_group0_keyval (&event->key)) {
+ case GDK_Delete:
+ case GDK_KP_Delete:
+ case GDK_BackSpace:
+ {
+ SPDocument *doc = SP_OBJECT_DOCUMENT(guide);
+ sp_guide_remove(guide);
+ sp_document_done(doc, SP_VERB_NONE, _("Delete guide"));
+ ret = TRUE;
+ break;
+ }
+ case GDK_Shift_L:
+ case GDK_Shift_R:
+ GdkCursor *guide_cursor;
+ guide_cursor = gdk_cursor_new (GDK_EXCHANGE);
+ gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, guide_cursor);
+ gdk_cursor_unref(guide_cursor);
+ ret = TRUE;
+ default:
+ // do nothing;
+ break;
+ }
break;
+ case GDK_KEY_RELEASE:
+ switch (get_group0_keyval (&event->key)) {
+ case GDK_Shift_L:
+ case GDK_Shift_R:
+ GdkCursor *guide_cursor;
+ guide_cursor = gdk_cursor_new (GDK_EXCHANGE);
+ gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, guide_cursor);
+ gdk_cursor_unref(guide_cursor);
+ break;
+ default:
+ // do nothing;
+ break;
+ }
+ default:
+ break;
}
return ret;
diff --git a/src/select-context.cpp b/src/select-context.cpp
index f58c034bdb9165a3d75bae9f78988fa6ad4ca0ab..aed594feeaaece89eeb7ee3644b1527b093001f0 100644 (file)
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
}
}
// 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;
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index e6983a681ebb42919cf504f1f8c4ca92eebb65f0..f5edf7d97cf3a63baf9820d97bf57822ae640f1b 100644 (file)
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -404,35 +404,45 @@ void sp_guide_set_normal(SPGuide const &guide, Geom::Point const normal_to_line,
/**
* Returns a human-readable description of the guideline for use in dialog boxes and status bar.
+ * If verbose is false, only positioning information is included (useful for dialogs).
*
* The caller is responsible for freeing the string.
*/
-char *sp_guide_description(SPGuide const *guide)
+char *sp_guide_description(SPGuide const *guide, const bool verbose)
{
using Geom::X;
using Geom::Y;
- GString *position_string_x = SP_PX_TO_METRIC_STRING(guide->point_on_line[X], SP_ACTIVE_DESKTOP->namedview->getDefaultMetric());
- GString *position_string_y = SP_PX_TO_METRIC_STRING(guide->point_on_line[Y], SP_ACTIVE_DESKTOP->namedview->getDefaultMetric());
+ GString *position_string_x = SP_PX_TO_METRIC_STRING(guide->point_on_line[X],
+ SP_ACTIVE_DESKTOP->namedview->getDefaultMetric());
+ GString *position_string_y = SP_PX_TO_METRIC_STRING(guide->point_on_line[Y],
+ SP_ACTIVE_DESKTOP->namedview->getDefaultMetric());
- const gchar *shortcuts = _("<b>drag</b> to move, <b>Shift+drag</b> to rotate, <b>Ctrl</b>+click to delete");
+ gchar *shortcuts = g_strdup_printf("; %s", _("<b>Shift+drag</b> to rotate, <b>Ctrl+drag</b> to move origin, <b>Del</b> to delete"));
+ gchar *descr;
if ( are_near(guide->normal_to_line, component_vectors[X]) ||
are_near(guide->normal_to_line, -component_vectors[X]) ) {
- return g_strdup_printf(_("vertical, at %s; %s"), position_string_x->str, shortcuts);
+ descr = g_strdup_printf(_("vertical, at %s"), position_string_x->str);
} else if ( are_near(guide->normal_to_line, component_vectors[Y]) ||
are_near(guide->normal_to_line, -component_vectors[Y]) ) {
- return g_strdup_printf(_("horizontal, at %s; %s"), position_string_y->str, shortcuts);
+ descr = g_strdup_printf(_("horizontal, at %s"), position_string_y->str);
} else {
double const radians = guide->angle();
double const degrees = Geom::rad_to_deg(radians);
int const degrees_int = (int) round(degrees);
- return g_strdup_printf(_("at %d degrees, through (%s,%s); %s"),
- degrees_int, position_string_x->str, position_string_y->str, shortcuts);
+ descr = g_strdup_printf(_("at %d degrees, through (%s,%s)"),
+ degrees_int, position_string_x->str, position_string_y->str);
}
g_string_free(position_string_x, TRUE);
g_string_free(position_string_y, TRUE);
+
+ if (verbose) {
+ descr = g_strconcat(descr, shortcuts, NULL);
+ }
+ g_free(shortcuts);
+ return descr;
}
void sp_guide_remove(SPGuide *guide)
diff --git a/src/sp-guide.h b/src/sp-guide.h
index 593e4583f57af9041bd4f9f012974626892be068..6bf541cd1e562a32287fd87c9655a196011e2e6f 100644 (file)
--- a/src/sp-guide.h
+++ b/src/sp-guide.h
void sp_guide_set_normal(SPGuide const &guide, Geom::Point const normal_to_line, bool const commit);
void sp_guide_remove(SPGuide *guide);
-char *sp_guide_description(SPGuide const *guide);
+char *sp_guide_description(SPGuide const *guide, const bool verbose = true);
#endif /* !SP_GUIDE_H */
diff --git a/src/svg-view.cpp b/src/svg-view.cpp
index bd86d54775df1282f8b6fd8883a38992339619ca..bd46dd17a6c86645eec790878106b47d4ce9ca28 100644 (file)
--- a/src/svg-view.cpp
+++ b/src/svg-view.cpp
{
GdkCursor *cursor = gdk_cursor_new(GDK_HAND2);
gdk_window_set_cursor(GTK_WIDGET(SP_CANVAS_ITEM(_drawing)->canvas)->window, cursor);
- gdk_cursor_destroy(cursor);
+ gdk_cursor_unref(cursor);
}
void
index c5d2ae48855023bf74261fee2b3336349d1ef68c..3a7964ba250e47bdb5546191bd5c0ae3fc9e9a64 100644 (file)
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
g_free(label);
}
{
- gchar *guide_description = sp_guide_description(_guide);
+ gchar *guide_description = sp_guide_description(_guide, false);
gchar *label = g_strdup_printf(_("Current: %s"), guide_description);
g_free(guide_description);
_label_descr.set_markup(label);
index 9a536487430dfb1efd4c02d6147f120d5d886f2c..e7b0188d81ae138fa505cf25e976125cd1e3cc8b 100644 (file)
g_object_unref (bitmap);
g_object_unref (mask);
gdk_window_set_cursor(w->window, cr);
+ gdk_cursor_unref(cr);
cr_set = true;
}
}