summaryrefslogtreecommitdiffstats
path: root/src/select-context.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mail@diedenrezi.nl>2009-01-25 13:35:08 +0000
committerdvlierop2 <dvlierop2@users.sourceforge.net>2009-01-25 13:35:08 +0000
commit3b35e676c9107f8627587365f6e01ebf0093e9c5 (patch)
tree8e5d306024820cf9b2adf2e5b4d4735959c8803e /src/select-context.cpp
parentremoving void files (diff)
downloadinkscape-3b35e676c9107f8627587365f6e01ebf0093e9c5.tar.gz
inkscape-3b35e676c9107f8627587365f6e01ebf0093e9c5.zip
- The snap-delay mechanism should now be more robust. From now on, it must be turned on and off explicitely within each context. This prevents delayed snapping events from being fired after the context or context's state has changed.
- Creating single dots now snaps (bzr r7172)
Diffstat (limited to 'src/select-context.cpp')
-rw-r--r--src/select-context.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/select-context.cpp b/src/select-context.cpp
index 1daf6b0e5..c7b305dd2 100644
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
@@ -326,7 +326,7 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE
sc->moved = FALSE;
sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5);
-
+
// remember the clicked item in sc->item:
if (sc->item) {
sp_object_unref(sc->item, NULL);
@@ -511,10 +511,10 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
item_in_group = desktop->item_at_point(Geom::Point(event->button.x, event->button.y), TRUE);
group_at_point = desktop->group_at_point(Geom::Point(event->button.x, event->button.y));
- // group-at-point is meant to be topmost item if it's a group,
+ // group-at-point is meant to be topmost item if it's a group,
// not topmost group of all items at point
- if (group_at_point != item_in_group &&
- !(group_at_point && item_at_point &&
+ if (group_at_point != item_in_group &&
+ !(group_at_point && item_at_point &&
group_at_point->isAncestorOf(item_at_point)))
group_at_point = NULL;
@@ -673,7 +673,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
sp_canvas_item_ungrab(sc->grabbed, event->button.time);
sc->grabbed = NULL;
}
-
+
desktop->updateNow();
}
if (event->button.button == 1) {
@@ -902,7 +902,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
}
ret = TRUE;
}
- break;
+ break;
case GDK_g:
case GDK_G:
if (MOD__SHIFT_ONLY) {