summaryrefslogtreecommitdiffstats
path: root/src/sp-guide.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-12-03 20:51:29 +0000
committerjabiertxof <jabier.arraiza@marker.es>2015-12-03 20:51:29 +0000
commit1cab611c173b2903512268994343f58ef83883ec (patch)
tree5413ada6c47986cf86a22c8dc1d9d639b6b86c5d /src/sp-guide.cpp
parentAdded no highlight and cross icon on locked guides (diff)
downloadinkscape-1cab611c173b2903512268994343f58ef83883ec.tar.gz
inkscape-1cab611c173b2903512268994343f58ef83883ec.zip
Add global lock guides to the rulers
(bzr r14500.1.5)
Diffstat (limited to 'src/sp-guide.cpp')
-rw-r--r--src/sp-guide.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index e37f0b470..00ded2a75 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -349,7 +349,9 @@ double SPGuide::getDistanceFrom(Geom::Point const &pt) const
*/
void SPGuide::moveto(Geom::Point const point_on_line, bool const commit)
{
- if(this->locked) {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ bool global_lock = prefs->getBool("/options/guides/guides_lock", false);
+ if(this->locked || global_lock) {
return;
}
for (GSList *l = views; l != NULL; l = l->next) {