From f6cf868ba9e303a31dda8830609f78397298ad57 Mon Sep 17 00:00:00 2001 From: lclausen Date: Sun, 1 Oct 2006 18:18:26 +0000 Subject: [PATCH] Fix of bug #350246: Broken snap-to-grid inside objects. --- ChangeLog | 8 ++++++++ app/modify_tool.c | 9 ++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f14f1e58..9017d670 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-10-01 Lars Clausen + + * app/modify_tool.c (modify_motion): Don't use null-ness of + connectionpoint to skip snap-to-grid for non-connectable handles. + Fixes bug #350246. + + * shapes/flowchart/predefdproc.shape: Fixed midpoint. + 2006-09-27 Steffen Macke * shapes/flowchart/datasource.png: diff --git a/app/modify_tool.c b/app/modify_tool.c index 405c46af..fd576051 100644 --- a/app/modify_tool.c +++ b/app/modify_tool.c @@ -377,7 +377,7 @@ modify_motion(ModifyTool *tool, GdkEventMotion *event, Point to; Point now, delta, full_delta; gboolean auto_scroll, vertical = FALSE; - ConnectionPoint *connectionpoint; + ConnectionPoint *connectionpoint = NULL; ObjectChange *objchange; gchar *postext; GtkStatusbar *statusbar; @@ -477,15 +477,14 @@ modify_motion(ModifyTool *tool, GdkEventMotion *event, if (!parent_handle_move_out_check(tool->object, &to)) parent_handle_move_in_check(tool->object, &to, &tool->start_at); - /* Move to ConnectionPoint if near: */ - connectionpoint = - object_find_connectpoint_display(ddisp, &to, tool->object, TRUE); - if (event->state & GDK_CONTROL_MASK) vertical = (fabs(full_delta.x) < fabs(full_delta.y)); highlight_reset_all(ddisp->diagram); if ((tool->handle->connect_type != HANDLE_NONCONNECTABLE)) { + /* Move to ConnectionPoint if near: */ + connectionpoint = + object_find_connectpoint_display(ddisp, &to, tool->object, TRUE); if (connectionpoint != NULL) { Color *hi_color; to = connectionpoint->pos; -- 2.11.4.GIT