From 1d8f1753cd8cab38d19fcc26a4ad70ba2e794ac8 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 9 Apr 2013 22:12:07 +0200 Subject: Added constructors to EventContext tree / some missing virtual pads. (bzr r11608.1.90) --- src/measure-context.cpp | 73 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 58 insertions(+), 15 deletions(-) (limited to 'src/measure-context.cpp') diff --git a/src/measure-context.cpp b/src/measure-context.cpp index dc23cf5c6..8b0a3608f 100644 --- a/src/measure-context.cpp +++ b/src/measure-context.cpp @@ -235,15 +235,26 @@ static void sp_measure_context_class_init(SPMeasureContextClass *klass) { SPEventContextClass *event_context_class = reinterpret_cast(klass); - event_context_class->setup = sp_measure_context_setup; - event_context_class->finish = sp_measure_context_finish; +// event_context_class->setup = sp_measure_context_setup; +// event_context_class->finish = sp_measure_context_finish; +// +// event_context_class->root_handler = sp_measure_context_root_handler; +// event_context_class->item_handler = sp_measure_context_item_handler; +} - event_context_class->root_handler = sp_measure_context_root_handler; - event_context_class->item_handler = sp_measure_context_item_handler; +CMeasureContext::CMeasureContext(SPMeasureContext* measurecontext) : CEventContext(measurecontext) { + this->spmeasurecontext = measurecontext; } -static void sp_measure_context_init(SPMeasureContext *measure_context) -{ +SPMeasureContext::SPMeasureContext() : SPEventContext() { + SPMeasureContext* measure_context = this; + + measure_context->cmeasurecontext = new CMeasureContext(measure_context); + delete measure_context->ceventcontext; + measure_context->ceventcontext = measure_context->cmeasurecontext; + + measure_context->grabbed = 0; + SPEventContext *event_context = SP_EVENT_CONTEXT(measure_context); event_context->cursor_shape = cursor_measure_xpm; @@ -251,8 +262,19 @@ static void sp_measure_context_init(SPMeasureContext *measure_context) event_context->hot_y = 4; } +static void sp_measure_context_init(SPMeasureContext *measure_context) +{ + new (measure_context) SPMeasureContext(); +} + static void sp_measure_context_finish(SPEventContext *ec) { + ec->ceventcontext->finish(); +} + +void CMeasureContext::finish() { + SPEventContext* ec = this->speventcontext; + SPMeasureContext *mc = SP_MEASURE_CONTEXT(ec); ec->enableGrDrag(false); @@ -265,18 +287,32 @@ static void sp_measure_context_finish(SPEventContext *ec) static void sp_measure_context_setup(SPEventContext *ec) { - if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->setup) { - SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->setup(ec); - } + ec->ceventcontext->setup(); +} + +void CMeasureContext::setup() { + SPEventContext* ec = this->speventcontext; + +// if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->setup) { +// SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->setup(ec); +// } + CEventContext::setup(); } static gint sp_measure_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event) { + return event_context->ceventcontext->item_handler(item, event); +} + +gint CMeasureContext::item_handler(SPItem* item, GdkEvent* event) { + SPEventContext* event_context = this->speventcontext; + gint ret = FALSE; - if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->item_handler) { - ret = SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->item_handler(event_context, item, event); - } +// if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->item_handler) { +// ret = SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->item_handler(event_context, item, event); +// } + ret = CEventContext::item_handler(item, event); return ret; } @@ -318,6 +354,12 @@ static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom: static gint sp_measure_context_root_handler(SPEventContext *event_context, GdkEvent *event) { + return event_context->ceventcontext->root_handler(event); +} + +gint CMeasureContext::root_handler(GdkEvent* event) { + SPEventContext* event_context = this->speventcontext; + SPDesktop *desktop = event_context->desktop; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); @@ -764,9 +806,10 @@ static gint sp_measure_context_root_handler(SPEventContext *event_context, GdkEv } if (!ret) { - if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->root_handler) { - ret = SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->root_handler(event_context, event); - } +// if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->root_handler) { +// ret = SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->root_handler(event_context, event); +// } + ret = CEventContext::root_handler(event); } return ret; -- cgit v1.2.3 From fbb85064cfaaf03cc09bacedb16a8561f61f2b3d Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 13 Apr 2013 00:37:18 +0200 Subject: Added prefPaths to contexts; modified SPFactory (bzr r11608.1.94) --- src/measure-context.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/measure-context.cpp') diff --git a/src/measure-context.cpp b/src/measure-context.cpp index 8b0a3608f..f56239690 100644 --- a/src/measure-context.cpp +++ b/src/measure-context.cpp @@ -64,6 +64,8 @@ boost::optional lastEnd; std::vector measure_tmp_items; +const std::string SPMeasureContext::prefsPath = "/tools/measure"; + G_DEFINE_TYPE(SPMeasureContext, sp_measure_context, SP_TYPE_EVENT_CONTEXT); namespace -- cgit v1.2.3 From fbdc8b84ff670c684dafc7d7d403ed01e7077e70 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 13 Apr 2013 18:13:17 +0200 Subject: Replaced casting macros for EventContext tree; added contructors. (bzr r11608.1.96) --- src/measure-context.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/measure-context.cpp') diff --git a/src/measure-context.cpp b/src/measure-context.cpp index f56239690..8012efc8b 100644 --- a/src/measure-context.cpp +++ b/src/measure-context.cpp @@ -64,6 +64,21 @@ boost::optional lastEnd; std::vector measure_tmp_items; + +#include "sp-factory.h" + +namespace { + SPEventContext* createMeasureContext() { + return new SPMeasureContext(); + } + + bool measureContextRegistered = ToolFactory::instance().registerObject("/tools/measure", createMeasureContext); +} + +const std::string& CMeasureContext::getPrefsPath() { + return SPMeasureContext::prefsPath; +} + const std::string SPMeasureContext::prefsPath = "/tools/measure"; G_DEFINE_TYPE(SPMeasureContext, sp_measure_context, SP_TYPE_EVENT_CONTEXT); @@ -254,6 +269,7 @@ SPMeasureContext::SPMeasureContext() : SPEventContext() { measure_context->cmeasurecontext = new CMeasureContext(measure_context); delete measure_context->ceventcontext; measure_context->ceventcontext = measure_context->cmeasurecontext; + types.insert(typeid(SPMeasureContext)); measure_context->grabbed = 0; -- cgit v1.2.3 From 65ba6ad9a82f8f47974eb10665478fd783692bb5 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 20 Apr 2013 23:19:46 +0200 Subject: Merging of EventContext classes complete. (bzr r11608.1.98) --- src/measure-context.cpp | 75 +++++++++---------------------------------------- 1 file changed, 13 insertions(+), 62 deletions(-) (limited to 'src/measure-context.cpp') diff --git a/src/measure-context.cpp b/src/measure-context.cpp index 8012efc8b..1b4d4afe3 100644 --- a/src/measure-context.cpp +++ b/src/measure-context.cpp @@ -47,12 +47,6 @@ using Inkscape::ControlManager; using Inkscape::CTLINE_SECONDARY; -static void sp_measure_context_setup(SPEventContext *ec); -static void sp_measure_context_finish(SPEventContext *ec); - -static gint sp_measure_context_root_handler(SPEventContext *event_context, GdkEvent *event); -static gint sp_measure_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event); - static gint xp = 0; // where drag started static gint yp = 0; static gint tolerance = 0; @@ -75,14 +69,12 @@ namespace { bool measureContextRegistered = ToolFactory::instance().registerObject("/tools/measure", createMeasureContext); } -const std::string& CMeasureContext::getPrefsPath() { +const std::string& SPMeasureContext::getPrefsPath() { return SPMeasureContext::prefsPath; } const std::string SPMeasureContext::prefsPath = "/tools/measure"; -G_DEFINE_TYPE(SPMeasureContext, sp_measure_context, SP_TYPE_EVENT_CONTEXT); - namespace { @@ -248,29 +240,10 @@ void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const ¢er, Geom } // namespace -static void sp_measure_context_class_init(SPMeasureContextClass *klass) -{ - SPEventContextClass *event_context_class = reinterpret_cast(klass); - -// event_context_class->setup = sp_measure_context_setup; -// event_context_class->finish = sp_measure_context_finish; -// -// event_context_class->root_handler = sp_measure_context_root_handler; -// event_context_class->item_handler = sp_measure_context_item_handler; -} - -CMeasureContext::CMeasureContext(SPMeasureContext* measurecontext) : CEventContext(measurecontext) { - this->spmeasurecontext = measurecontext; -} SPMeasureContext::SPMeasureContext() : SPEventContext() { SPMeasureContext* measure_context = this; - measure_context->cmeasurecontext = new CMeasureContext(measure_context); - delete measure_context->ceventcontext; - measure_context->ceventcontext = measure_context->cmeasurecontext; - types.insert(typeid(SPMeasureContext)); - measure_context->grabbed = 0; SPEventContext *event_context = SP_EVENT_CONTEXT(measure_context); @@ -280,18 +253,11 @@ SPMeasureContext::SPMeasureContext() : SPEventContext() { event_context->hot_y = 4; } -static void sp_measure_context_init(SPMeasureContext *measure_context) -{ - new (measure_context) SPMeasureContext(); -} - -static void sp_measure_context_finish(SPEventContext *ec) -{ - ec->ceventcontext->finish(); +SPMeasureContext::~SPMeasureContext() { } -void CMeasureContext::finish() { - SPEventContext* ec = this->speventcontext; +void SPMeasureContext::finish() { + SPEventContext* ec = this; SPMeasureContext *mc = SP_MEASURE_CONTEXT(ec); @@ -303,34 +269,24 @@ void CMeasureContext::finish() { } } -static void sp_measure_context_setup(SPEventContext *ec) -{ - ec->ceventcontext->setup(); -} - -void CMeasureContext::setup() { - SPEventContext* ec = this->speventcontext; +void SPMeasureContext::setup() { + SPEventContext* ec = this; // if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->setup) { // SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->setup(ec); // } - CEventContext::setup(); + SPEventContext::setup(); } -static gint sp_measure_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event) -{ - return event_context->ceventcontext->item_handler(item, event); -} - -gint CMeasureContext::item_handler(SPItem* item, GdkEvent* event) { - SPEventContext* event_context = this->speventcontext; +gint SPMeasureContext::item_handler(SPItem* item, GdkEvent* event) { + SPEventContext* event_context = this; gint ret = FALSE; // if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->item_handler) { // ret = SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->item_handler(event_context, item, event); // } - ret = CEventContext::item_handler(item, event); + ret = SPEventContext::item_handler(item, event); return ret; } @@ -370,13 +326,8 @@ static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom: } } -static gint sp_measure_context_root_handler(SPEventContext *event_context, GdkEvent *event) -{ - return event_context->ceventcontext->root_handler(event); -} - -gint CMeasureContext::root_handler(GdkEvent* event) { - SPEventContext* event_context = this->speventcontext; +gint SPMeasureContext::root_handler(GdkEvent* event) { + SPEventContext* event_context = this; SPDesktop *desktop = event_context->desktop; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); @@ -827,7 +778,7 @@ gint CMeasureContext::root_handler(GdkEvent* event) { // if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->root_handler) { // ret = SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->root_handler(event_context, event); // } - ret = CEventContext::root_handler(event); + ret = SPEventContext::root_handler(event); } return ret; -- cgit v1.2.3 From 5512f857e2f33f1aa40124dc82b353e5f2e5a0b0 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 20 Apr 2013 23:58:53 +0200 Subject: Moved factories to different files. (bzr r11608.1.100) --- src/measure-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/measure-context.cpp') diff --git a/src/measure-context.cpp b/src/measure-context.cpp index 1b4d4afe3..2e8a1cd99 100644 --- a/src/measure-context.cpp +++ b/src/measure-context.cpp @@ -59,7 +59,7 @@ boost::optional lastEnd; std::vector measure_tmp_items; -#include "sp-factory.h" +#include "tool-factory.h" namespace { SPEventContext* createMeasureContext() { -- cgit v1.2.3 From 389b871cdea29ace85567863c439eb0537a36f54 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 20:45:27 +0200 Subject: Cleaned up a bit. (bzr r11608.1.102) --- src/measure-context.cpp | 114 +++++++++++++++++++----------------------------- 1 file changed, 45 insertions(+), 69 deletions(-) (limited to 'src/measure-context.cpp') diff --git a/src/measure-context.cpp b/src/measure-context.cpp index 2e8a1cd99..99f1d8d06 100644 --- a/src/measure-context.cpp +++ b/src/measure-context.cpp @@ -47,11 +47,6 @@ using Inkscape::ControlManager; using Inkscape::CTLINE_SECONDARY; -static gint xp = 0; // where drag started -static gint yp = 0; -static gint tolerance = 0; -static bool within_tolerance = false; - Geom::Point start_point; boost::optional explicitBase; boost::optional lastEnd; @@ -242,54 +237,44 @@ void createAngleDisplayCurve(SPDesktop *desktop, Geom::Point const ¢er, Geom SPMeasureContext::SPMeasureContext() : SPEventContext() { - SPMeasureContext* measure_context = this; - - measure_context->grabbed = 0; + this->grabbed = 0; - SPEventContext *event_context = SP_EVENT_CONTEXT(measure_context); - - event_context->cursor_shape = cursor_measure_xpm; - event_context->hot_x = 4; - event_context->hot_y = 4; + this->cursor_shape = cursor_measure_xpm; + this->hot_x = 4; + this->hot_y = 4; } SPMeasureContext::~SPMeasureContext() { } void SPMeasureContext::finish() { - SPEventContext* ec = this; - - SPMeasureContext *mc = SP_MEASURE_CONTEXT(ec); + this->enableGrDrag(false); - ec->enableGrDrag(false); - - if (mc->grabbed) { - sp_canvas_item_ungrab(mc->grabbed, GDK_CURRENT_TIME); - mc->grabbed = NULL; + if (this->grabbed) { + sp_canvas_item_ungrab(this->grabbed, GDK_CURRENT_TIME); + this->grabbed = NULL; } } -void SPMeasureContext::setup() { - SPEventContext* ec = this; - -// if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->setup) { -// SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->setup(ec); -// } - SPEventContext::setup(); -} - -gint SPMeasureContext::item_handler(SPItem* item, GdkEvent* event) { - SPEventContext* event_context = this; - - gint ret = FALSE; - -// if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->item_handler) { -// ret = SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->item_handler(event_context, item, event); -// } - ret = SPEventContext::item_handler(item, event); - - return ret; -} +//void SPMeasureContext::setup() { +// SPEventContext* ec = this; +// +//// if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->setup) { +//// SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->setup(ec); +//// } +// SPEventContext::setup(); +//} + +//gint SPMeasureContext::item_handler(SPItem* item, GdkEvent* event) { +// gint ret = FALSE; +// +//// if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->item_handler) { +//// ret = SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->item_handler(event_context, item, event); +//// } +// ret = SPEventContext::item_handler(item, event); +// +// return ret; +//} static bool GeomPointSortPredicate(const Geom::Point& p1, const Geom::Point& p2) { @@ -327,23 +312,19 @@ static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom: } gint SPMeasureContext::root_handler(GdkEvent* event) { - SPEventContext* event_context = this; - - SPDesktop *desktop = event_context->desktop; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); - SPMeasureContext *mc = SP_MEASURE_CONTEXT(event_context); gint ret = FALSE; switch (event->type) { - case GDK_BUTTON_PRESS: - { + case GDK_BUTTON_PRESS: { Geom::Point const button_w(event->button.x, event->button.y); explicitBase = boost::none; lastEnd = boost::none; start_point = desktop->w2d(button_w); - if (event->button.button == 1 && !event_context->space_panning) { + + if (event->button.button == 1 && !this->space_panning) { // save drag origin xp = static_cast(event->button.x); yp = static_cast(event->button.y); @@ -360,12 +341,10 @@ gint SPMeasureContext::root_handler(GdkEvent* event) { sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK, NULL, event->button.time); - mc->grabbed = SP_CANVAS_ITEM(desktop->acetate); + this->grabbed = SP_CANVAS_ITEM(desktop->acetate); break; } - - case GDK_KEY_PRESS: - { + case GDK_KEY_PRESS: { if ((event->key.keyval == GDK_KEY_Shift_L) || (event->key.keyval == GDK_KEY_Shift_R)) { if (lastEnd) { explicitBase = lastEnd; @@ -373,10 +352,8 @@ gint SPMeasureContext::root_handler(GdkEvent* event) { } break; } - - case GDK_MOTION_NOTIFY: - { - if (!((event->motion.state & GDK_BUTTON1_MASK) && !event_context->space_panning)) { + case GDK_MOTION_NOTIFY: { + if (!((event->motion.state & GDK_BUTTON1_MASK) && !this->space_panning)) { if (!(event->motion.state & GDK_SHIFT_MASK)) { Geom::Point const motion_w(event->motion.x, event->motion.y); Geom::Point const motion_dt(desktop->w2d(motion_w)); @@ -407,6 +384,7 @@ gint SPMeasureContext::root_handler(GdkEvent* event) { for (size_t idx = 0; idx < measure_tmp_items.size(); ++idx) { desktop->remove_temporary_canvasitem(measure_tmp_items[idx]); } + measure_tmp_items.clear(); Geom::Point const motion_w(event->motion.x, event->motion.y); @@ -414,7 +392,7 @@ gint SPMeasureContext::root_handler(GdkEvent* event) { Geom::Point end_point = motion_dt; if (event->motion.state & GDK_CONTROL_MASK) { - spdc_endpoint_snap_rotation(event_context, end_point, start_point, event->motion.state); + spdc_endpoint_snap_rotation(this, end_point, start_point, event->motion.state); } else { if (!(event->motion.state & GDK_SHIFT_MASK)) { SnapManager &m = desktop->namedview->snap_manager; @@ -427,7 +405,6 @@ gint SPMeasureContext::root_handler(GdkEvent* event) { } } - Geom::PathVector lineseg; Geom::Path p; p.start(desktop->dt2doc(start_point)); @@ -445,6 +422,7 @@ gint SPMeasureContext::root_handler(GdkEvent* event) { baseAngle = atan2(deltay2, deltax2); angle -= baseAngle; + if (angle < -M_PI) { angle += 2 * M_PI; } else if (angle > M_PI) { @@ -457,6 +435,7 @@ gint SPMeasureContext::root_handler(GdkEvent* event) { #define NPOINTS 800 std::vector points; + for (double i = 0; i < NPOINTS; i++) { points.push_back(desktop->d2w(start_point + (i / NPOINTS) * (end_point - start_point))); } @@ -749,10 +728,8 @@ gint SPMeasureContext::root_handler(GdkEvent* event) { } break; } - - case GDK_BUTTON_RELEASE: - { - sp_event_context_discard_delayed_snap_event(event_context); + case GDK_BUTTON_RELEASE: { + sp_event_context_discard_delayed_snap_event(this); explicitBase = boost::none; lastEnd = boost::none; @@ -760,12 +737,14 @@ gint SPMeasureContext::root_handler(GdkEvent* event) { for (size_t idx = 0; idx < measure_tmp_items.size(); ++idx) { desktop->remove_temporary_canvasitem(measure_tmp_items[idx]); } + measure_tmp_items.clear(); - if (mc->grabbed) { - sp_canvas_item_ungrab(mc->grabbed, event->button.time); - mc->grabbed = NULL; + if (this->grabbed) { + sp_canvas_item_ungrab(this->grabbed, event->button.time); + this->grabbed = NULL; } + xp = 0; yp = 0; break; @@ -775,9 +754,6 @@ gint SPMeasureContext::root_handler(GdkEvent* event) { } if (!ret) { -// if (SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->root_handler) { -// ret = SP_EVENT_CONTEXT_CLASS(sp_measure_context_parent_class)->root_handler(event_context, event); -// } ret = SPEventContext::root_handler(event); } -- cgit v1.2.3 From b2dd3583e7372d23d18bbc6e861f4f645ec3dc37 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 30 Jul 2013 23:17:21 +0200 Subject: Further refactoring of EventContexts. (bzr r11608.1.109) --- src/measure-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/measure-context.cpp') diff --git a/src/measure-context.cpp b/src/measure-context.cpp index 99f1d8d06..9ee728bc8 100644 --- a/src/measure-context.cpp +++ b/src/measure-context.cpp @@ -311,7 +311,7 @@ static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom: } } -gint SPMeasureContext::root_handler(GdkEvent* event) { +bool SPMeasureContext::root_handler(GdkEvent* event) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); -- cgit v1.2.3