![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 98e96c38c166205d3686cdef20d6e7f46d4f0726..d5158255abe473f0f700032445257229a59c8b2c 100644 (file)
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
#include "xml/repr.h"
#include "dialogs/guidelinedialog.h"
#include "snap.h"
+#include "display/canvas-grid.h"
+#include "display/canvas-axonomgrid.h"
+#include <2geom/point.h>
/* Root item handler */
{
static bool dragging = false;
static SPCanvasItem *guide = NULL;
+ static Geom::Point normal;
int wx, wy;
SPDesktop *desktop = dtw->desktop;
gdk_window_get_pointer(GTK_WIDGET(dtw->canvas)->window, &wx, &wy, NULL);
NR::Point const event_win(wx, wy);
+ gint width, height;
+ gdk_window_get_geometry(GTK_WIDGET(dtw->canvas)->window, NULL /*x*/, NULL /*y*/, &width, &height, NULL/*depth*/);
+
switch (event->type) {
- case GDK_BUTTON_PRESS:
+ case GDK_BUTTON_PRESS:
if (event->button.button == 1) {
dragging = true;
NR::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
@@ -63,10 +70,42 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
sp_repr_set_boolean(repr, "showguides", TRUE);
sp_repr_set_boolean(repr, "inkscape:guide-bbox", TRUE);
- double const guide_pos_dt = event_dt[ horiz
- ? NR::Y
- : NR::X ];
- guide = sp_guideline_new(desktop->guides, guide_pos_dt, !horiz);
+ // calculate the normal of the guidelines when dragged from the edges of rulers.
+ Geom::Point normal_bl_to_tr(-1.,1.); //bottomleft to topright
+ Geom::Point normal_tr_to_bl(1.,1.); //topright to bottomleft
+ normal_bl_to_tr.normalize();
+ normal_tr_to_bl.normalize();
+ Inkscape::CanvasGrid * grid = sp_namedview_get_first_enabled_grid(desktop->namedview);
+ if ( grid && grid->getGridType() == Inkscape::GRID_AXONOMETRIC ) {
+ Inkscape::CanvasAxonomGrid *axonomgrid = dynamic_cast<Inkscape::CanvasAxonomGrid *>(grid);
+ if (event->button.state & GDK_CONTROL_MASK) {
+ // guidelines normal to gridlines
+ normal_bl_to_tr = Geom::Point::polar(-axonomgrid->angle_rad[0], 1.0);
+ normal_tr_to_bl = Geom::Point::polar(axonomgrid->angle_rad[2], 1.0);
+ } else {
+ normal_bl_to_tr = rot90(Geom::Point::polar(axonomgrid->angle_rad[2], 1.0));
+ normal_tr_to_bl = rot90(Geom::Point::polar(-axonomgrid->angle_rad[0], 1.0));
+ }
+ }
+ if (horiz) {
+ if (wx < 50) {
+ normal = normal_bl_to_tr;
+ } else if (wx > width - 50) {
+ normal = normal_tr_to_bl;
+ } else {
+ normal = Geom::Point(0.,1.);
+ }
+ } else {
+ if (wy < 50) {
+ normal = normal_bl_to_tr;
+ } else if (wy > height - 50) {
+ normal = normal_tr_to_bl;
+ } else {
+ normal = Geom::Point(1.,0.);
+ }
+ }
+
+ guide = sp_guideline_new(desktop->guides, event_dt.to_2geom(), normal);
sp_guideline_set_color(SP_GUIDELINE(guide), desktop->namedview->guidehicolor);
gdk_pointer_grab(widget->window, FALSE,
(GdkEventMask)(GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ),
@@ -74,31 +113,27 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
event->button.time);
}
break;
- case GDK_MOTION_NOTIFY:
+ case GDK_MOTION_NOTIFY:
if (dragging) {
NR::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
NR::Point event_dt(desktop->w2d(event_w));
SnapManager const &m = desktop->namedview->snap_manager;
- event_dt = m.guideSnap(event_dt, component_vectors[horiz ? NR::Y : NR::X]).getPoint();
-
- double const guide_pos_dt = event_dt[ horiz
- ? NR::Y
- : NR::X ];
+ event_dt = m.guideSnap(event_dt, normal).getPoint();
- sp_guideline_set_position(SP_GUIDELINE(guide), guide_pos_dt);
+ sp_guideline_set_position(SP_GUIDELINE(guide), event_dt.to_2geom());
desktop->set_coordinate_status(event_dt);
desktop->setPosition (event_dt);
}
break;
- case GDK_BUTTON_RELEASE:
+ case GDK_BUTTON_RELEASE:
if (dragging && event->button.button == 1) {
gdk_pointer_ungrab(event->button.time);
NR::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
NR::Point event_dt(desktop->w2d(event_w));
SnapManager const &m = desktop->namedview->snap_manager;
- event_dt = m.guideSnap(event_dt, component_vectors[horiz ? NR::Y : NR::X]).getPoint();
+ event_dt = m.guideSnap(event_dt, normal).getPoint();
dragging = false;
gtk_object_destroy(GTK_OBJECT(guide));
@@ -106,11 +141,8 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
if ((horiz ? wy : wx) >= 0) {
Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
Inkscape::XML::Node *repr = xml_doc->createElement("sodipodi:guide");
- repr->setAttribute("orientation", (horiz) ? "horizontal" : "vertical");
- double const guide_pos_dt = event_dt[ horiz
- ? NR::Y
- : NR::X ];
- sp_repr_set_svg_double(repr, "position", guide_pos_dt);
+ sp_repr_set_point(repr, "orientation", normal);
+ sp_repr_set_point(repr, "position", event_dt.to_2geom());
SP_OBJECT_REPR(desktop->namedview)->appendChild(repr);
Inkscape::GC::release(repr);
sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
ret = TRUE;
}
break;
- case GDK_MOTION_NOTIFY:
+ case GDK_MOTION_NOTIFY:
if (dragging) {
NR::Point const motion_w(event->motion.x,
event->motion.y);
// This is for snapping while dragging existing guidelines. New guidelines,
// which are dragged off the ruler, are being snapped in sp_dt_ruler_event
SnapManager const &m = desktop->namedview->snap_manager;
- motion_dt = m.guideSnap(motion_dt, guide->normal).getPoint();
+ motion_dt = m.guideSnap(motion_dt, guide->normal_to_line).getPoint();
- sp_guide_moveto(*guide, sp_guide_position_from_pt(guide, motion_dt), false);
+ sp_guide_moveto(*guide, motion_dt.to_2geom(), false);
moved = true;
desktop->set_coordinate_status(motion_dt);
desktop->setPosition (motion_dt);
ret = TRUE;
}
break;
- case GDK_BUTTON_RELEASE:
+ case GDK_BUTTON_RELEASE:
if (dragging && event->button.button == 1) {
if (moved) {
NR::Point const event_w(event->button.x,
event->button.y);
NR::Point event_dt(desktop->w2d(event_w));
-
+
SnapManager const &m = desktop->namedview->snap_manager;
- event_dt = m.guideSnap(event_dt, guide->normal).getPoint();
-
+ event_dt = m.guideSnap(event_dt, guide->normal_to_line).getPoint();
+
if (sp_canvas_world_pt_inside_window(item->canvas, event_w)) {
- sp_guide_moveto(*guide, sp_guide_position_from_pt(guide, event_dt), true);
+ sp_guide_moveto(*guide, event_dt.to_2geom(), true);
sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
_("Move guide"));
} else {
/* Undo movement of any attached shapes. */
- sp_guide_moveto(*guide, guide->position, false);
+ sp_guide_moveto(*guide, guide->point_on_line, false);
sp_guide_remove(guide);
sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
_("Delete guide"));
sp_canvas_item_ungrab(item, event->button.time);
ret=TRUE;
}
- case GDK_ENTER_NOTIFY:
- {
-
+ case GDK_ENTER_NOTIFY:
+ {
sp_guideline_set_color(SP_GUIDELINE(item), guide->hicolor);
- GString *position_string = SP_PX_TO_METRIC_STRING(guide->position, desktop->namedview->getDefaultMetric());
char *guide_description = sp_guide_description(guide);
-
- desktop->guidesMessageContext()->setF(Inkscape::NORMAL_MESSAGE, _("%s at %s"), guide_description, position_string->str);
-
+ desktop->guidesMessageContext()->setF(Inkscape::NORMAL_MESSAGE, "%s", guide_description);
g_free(guide_description);
- g_string_free(position_string, TRUE);
break;
- }
- case GDK_LEAVE_NOTIFY:
+ }
+ case GDK_LEAVE_NOTIFY:
sp_guideline_set_color(SP_GUIDELINE(item), guide->color);
desktop->guidesMessageContext()->clear();
break;
- default:
+ default:
break;
}