summaryrefslogtreecommitdiffstats
path: root/src/seltrans.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mail@diedenrezi.nl>2009-04-02 20:21:13 +0000
committerdvlierop2 <dvlierop2@users.sourceforge.net>2009-04-02 20:21:13 +0000
commit823e1f70a10fe1910a1b2c6a0c65012f69e7c38d (patch)
tree958827a08f8c3c4632a5d4f1f18fe7e292a1df0a /src/seltrans.cpp
parentWhether we drag a guide's origin or rotate the guide around its origin is now... (diff)
downloadinkscape-823e1f70a10fe1910a1b2c6a0c65012f69e7c38d.tar.gz
inkscape-823e1f70a10fe1910a1b2c6a0c65012f69e7c38d.zip
- Don't display the snap-source-indicator when we're about to rotate using the selector tool (because it won't snap when rotating!)
- Use a smaller snap-source-indicator, which is visually more appealing (bzr r7608)
Diffstat (limited to 'src/seltrans.cpp')
-rw-r--r--src/seltrans.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index e6c53acfe..1ee7faff8 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -357,13 +357,17 @@ void Inkscape::SelTrans::grab(Geom::Point const &p, gdouble x, gdouble y, bool s
}
}
- // Now either _bbox_points or _snap_points has a single element, the other one has zero..... or both have zero elements
- g_assert((_bbox_points.size() + _snap_points.size()) < 2);
- if (m.snapprefs.getSnapEnabledGlobally()) {
- if (_bbox_points.size() == 1) {
- _desktop->snapindicator->set_new_snapsource(_bbox_points.at(0));
- } else if (_snap_points.size() == 1){
- _desktop->snapindicator->set_new_snapsource(_snap_points.at(0));
+
+ // Optionally, show the snap source
+ if (!(_state == STATE_ROTATE && x != 0.5 && y != 0.5)) { // but not when we're draging a rotation handle, because that won't snap
+ // Now either _bbox_points or _snap_points has a single element, the other one has zero..... or both have zero elements
+ g_assert((_bbox_points.size() + _snap_points.size()) < 2);
+ if (m.snapprefs.getSnapEnabledGlobally()) {
+ if (_bbox_points.size() == 1) {
+ _desktop->snapindicator->set_new_snapsource(_bbox_points.at(0));
+ } else if (_snap_points.size() == 1){
+ _desktop->snapindicator->set_new_snapsource(_snap_points.at(0));
+ }
}
}
}