From cd42e539d330b86dd224a944b248088e05969856 Mon Sep 17 00:00:00 2001 From: dvlierop2 Date: Mon, 30 Mar 2009 20:14:00 +0000 Subject: [PATCH] Fix bug #338838: Using double-click on a selected shape to switch to that shape's tool would give a snap-window-already-closed warning --- src/arc-context.cpp | 2 +- src/box3d-context.cpp | 2 +- src/rect-context.cpp | 2 +- src/spiral-context.cpp | 2 +- src/star-context.cpp | 2 +- src/text-context.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/arc-context.cpp b/src/arc-context.cpp index e33985c22..83cdd73c1 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -266,7 +266,7 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent event_context->xp = event_context->yp = 0; if (event->button.button == 1 && !event_context->space_panning) { dragging = false; - sp_event_context_snap_window_closed(event_context); + sp_event_context_snap_window_closed(event_context, false); //button release will also occur on a double-click; in that case suppress warnings if (!event_context->within_tolerance) { // we've been dragging, finish the arc sp_arc_finish(ac); diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp index 5fb85d793..a28463e02 100644 --- a/src/box3d-context.cpp +++ b/src/box3d-context.cpp @@ -373,7 +373,7 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven event_context->xp = event_context->yp = 0; if ( event->button.button == 1 && !event_context->space_panning) { dragging = false; - sp_event_context_snap_window_closed(event_context); + sp_event_context_snap_window_closed(event_context, false); //button release will also occur on a double-click; in that case suppress warnings if (!event_context->within_tolerance) { // we've been dragging, finish the box diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 9c1c704dd..c05f00759 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -306,7 +306,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent event_context->xp = event_context->yp = 0; if (event->button.button == 1 && !event_context->space_panning) { dragging = false; - sp_event_context_snap_window_closed(event_context); + sp_event_context_snap_window_closed(event_context, false); //button release will also occur on a double-click; in that case suppress warnings if (!event_context->within_tolerance) { // we've been dragging, finish the rect diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp index 67ee82b35..cd90ac1cf 100644 --- a/src/spiral-context.cpp +++ b/src/spiral-context.cpp @@ -269,7 +269,7 @@ sp_spiral_context_root_handler(SPEventContext *event_context, GdkEvent *event) event_context->xp = event_context->yp = 0; if (event->button.button == 1 && !event_context->space_panning) { dragging = FALSE; - sp_event_context_snap_window_closed(event_context); + sp_event_context_snap_window_closed(event_context, false); //button release will also occur on a double-click; in that case suppress warnings if (!event_context->within_tolerance) { // we've been dragging, finish the spiral sp_spiral_finish(sc); diff --git a/src/star-context.cpp b/src/star-context.cpp index 5361219aa..a00442608 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -281,7 +281,7 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent event_context->xp = event_context->yp = 0; if (event->button.button == 1 && !event_context->space_panning) { dragging = FALSE; - sp_event_context_snap_window_closed(event_context); + sp_event_context_snap_window_closed(event_context, false); //button release will also occur on a double-click; in that case suppress warnings if (!event_context->within_tolerance) { // we've been dragging, finish the star sp_star_finish (sc); diff --git a/src/text-context.cpp b/src/text-context.cpp index a5af08385..21f74a84b 100644 --- a/src/text-context.cpp +++ b/src/text-context.cpp @@ -388,7 +388,7 @@ sp_text_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEve case GDK_BUTTON_RELEASE: if (event->button.button == 1 && tc->dragging && !event_context->space_panning) { tc->dragging = 0; - sp_event_context_snap_window_closed(event_context); + sp_event_context_snap_window_closed(event_context, false); //button release will also occur on a double-click; in that case suppress warnings ret = TRUE; } break; -- 2.30.2