diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-09-27 10:23:10 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-09-27 10:23:10 +0000 |
| commit | d19888e176d1b27e703e593e18f4123719e9cd89 (patch) | |
| tree | 5d79bc9b39be2bc425d0a1e04cf1362e4fa99ac5 /src/measure-context.cpp | |
| parent | Fix editing paths in live effect (diff) | |
| parent | Adjusted code style of SPEllipse. (diff) | |
| download | inkscape-d19888e176d1b27e703e593e18f4123719e9cd89.tar.gz inkscape-d19888e176d1b27e703e593e18f4123719e9cd89.zip | |
update to trunk
(bzr r11950.1.155)
Diffstat (limited to 'src/measure-context.cpp')
| -rw-r--r-- | src/measure-context.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/measure-context.cpp b/src/measure-context.cpp index 8db703205..9d8dc2b2f 100644 --- a/src/measure-context.cpp +++ b/src/measure-context.cpp @@ -48,10 +48,6 @@ using Inkscape::ControlManager; using Inkscape::CTLINE_SECONDARY; using Inkscape::Util::unit_table; -Geom::Point start_point; -boost::optional<Geom::Point> explicitBase; -boost::optional<Geom::Point> lastEnd; - std::vector<Inkscape::Display::TemporaryItem*> measure_tmp_items; @@ -313,6 +309,10 @@ static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom: } bool SPMeasureContext::root_handler(GdkEvent* event) { + Geom::Point start_point; + boost::optional<Geom::Point> explicitBase; + boost::optional<Geom::Point> lastEnd; + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); |