diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-09-28 18:47:16 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-09-28 18:47:16 +0000 |
| commit | 6ee13490aaa9781b765589e22fb9206c6cb7e9e9 (patch) | |
| tree | 55b231d3f7ced14963b7d6e2bf1f41f255e85ebe /src | |
| parent | components of _image_name were g_strdup'ed so need to be g_free'd (diff) | |
| download | inkscape-6ee13490aaa9781b765589e22fb9206c6cb7e9e9.tar.gz inkscape-6ee13490aaa9781b765589e22fb9206c6cb7e9e9.zip | |
Fixed MeasureContext.
Fixed bugs:
- https://launchpad.net/bugs/1232494
(bzr r12613)
Diffstat (limited to 'src')
| -rw-r--r-- | src/measure-context.cpp | 4 | ||||
| -rw-r--r-- | src/measure-context.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/measure-context.cpp b/src/measure-context.cpp index 9d8dc2b2f..7570e36e7 100644 --- a/src/measure-context.cpp +++ b/src/measure-context.cpp @@ -309,10 +309,6 @@ 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); diff --git a/src/measure-context.h b/src/measure-context.h index e42265045..7d5a88ab7 100644 --- a/src/measure-context.h +++ b/src/measure-context.h @@ -13,6 +13,8 @@ */ #include "event-context.h" +#include <2geom/point.h> +#include <boost/optional.hpp> #define SP_MEASURE_CONTEXT(obj) (dynamic_cast<SPMeasureContext*>((SPEventContext*)obj)) #define SP_IS_MEASURE_CONTEXT(obj) (dynamic_cast<const SPMeasureContext*>((const SPEventContext*)obj) != NULL) @@ -31,6 +33,10 @@ public: private: SPCanvasItem* grabbed; + + Geom::Point start_point; + boost::optional<Geom::Point> explicitBase; + boost::optional<Geom::Point> lastEnd; }; #endif // SEEN_SP_MEASURING_CONTEXT_H |