diff options
| author | Diederik van Lierop <mailat-signdiedenrezidotnl> | 2010-02-21 09:01:33 +0000 |
|---|---|---|
| committer | Diederik van Lierop <mailat-signdiedenrezidotnl> | 2010-02-21 09:01:33 +0000 |
| commit | 99c82c93cb8e9d023cb65f5e0f6ea357db5092ba (patch) | |
| tree | 6f138974e9f0cd987a751c274bad9e73561f528d /src/display | |
| parent | Fix a memory leak in the object-snapper (diff) | |
| download | inkscape-99c82c93cb8e9d023cb65f5e0f6ea357db5092ba.tar.gz inkscape-99c82c93cb8e9d023cb65f5e0f6ea357db5092ba.zip | |
Make sure that guides always snap correctly when dropping them, and improve perseverance of snap-indicator
(bzr r9103)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/snap-indicator.cpp | 11 | ||||
| -rw-r--r-- | src/display/snap-indicator.h | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/display/snap-indicator.cpp b/src/display/snap-indicator.cpp index b135dd9fe..c0ed322e4 100644 --- a/src/display/snap-indicator.cpp +++ b/src/display/snap-indicator.cpp @@ -6,7 +6,7 @@ * Diederik van Lierop * * Copyright (C) Johan Engelen 2009 <j.b.c.engelen@utwente.nl> - * Copyright (C) Diederik van Lierop 2009 <mail@diedenrezi.nl> + * Copyright (C) Diederik van Lierop 2010 <mail@diedenrezi.nl> * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -31,6 +31,7 @@ SnapIndicator::SnapIndicator(SPDesktop * desktop) _snaptarget_tooltip(NULL), _snaptarget_bbox(NULL), _snapsource(NULL), + _snaptarget_is_presnap(false), _desktop(desktop) { } @@ -240,6 +241,7 @@ SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap SP_CTRL(canvasitem)->moveto(p.getPoint()); _snaptarget = _desktop->add_temporary_canvasitem(canvasitem, timeout_val); + _snaptarget_is_presnap = pre_snap; // Display the tooltip, which reveals the type of snap source and the type of snap target gchar *tooltip_str = g_strconcat(source_name, _(" to "), target_name, NULL); @@ -271,11 +273,16 @@ SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap } void -SnapIndicator::remove_snaptarget() +SnapIndicator::remove_snaptarget(bool only_if_presnap) { + if (only_if_presnap && !_snaptarget_is_presnap) { + return; + } + if (_snaptarget) { _desktop->remove_temporary_canvasitem(_snaptarget); _snaptarget = NULL; + _snaptarget_is_presnap = false; } if (_snaptarget_tooltip) { diff --git a/src/display/snap-indicator.h b/src/display/snap-indicator.h index 259af8ae6..5475f9f60 100644 --- a/src/display/snap-indicator.h +++ b/src/display/snap-indicator.h @@ -9,7 +9,7 @@ * Diederik van Lierop * * Copyright (C) Johan Engelen 2008 <j.b.c.engelen@utwente.nl> - * Copyright (C) Diederik van Lierop 2008 <mail@diedenrezi.nl> + * Copyright (C) Diederik van Lierop 2010 <mail@diedenrezi.nl> * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -27,7 +27,7 @@ public: virtual ~SnapIndicator(); void set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap = false); - void remove_snaptarget(); + void remove_snaptarget(bool only_if_presnap = false); void set_new_snapsource(Inkscape::SnapCandidatePoint const &p); void remove_snapsource(); @@ -37,6 +37,7 @@ protected: TemporaryItem *_snaptarget_tooltip; TemporaryItem *_snaptarget_bbox; TemporaryItem *_snapsource; + bool _snaptarget_is_presnap; SPDesktop *_desktop; private: |