diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-01-20 09:45:43 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-01-20 09:45:43 +0000 |
| commit | a9ead40d7ef23b967f42333ec58b54266a8553a5 (patch) | |
| tree | 73841e63909abc4e982ca26f9dff122eb21e48d4 /src/ui | |
| parent | update to trunk (diff) | |
| parent | Revert changes from r12959 and r12955, impliment new stratedgy to fix bug #16... (diff) | |
| download | inkscape-a9ead40d7ef23b967f42333ec58b54266a8553a5.tar.gz inkscape-a9ead40d7ef23b967f42333ec58b54266a8553a5.zip | |
update to trunk
(bzr r11950.1.236)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/template-widget.cpp | 2 | ||||
| -rw-r--r-- | src/ui/tools/tool-base.cpp | 12 | ||||
| -rw-r--r-- | src/ui/tools/tool-base.h | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp index d1697244e..d8e6f9b4f 100644 --- a/src/ui/dialog/template-widget.cpp +++ b/src/ui/dialog/template-widget.cpp @@ -34,7 +34,7 @@ namespace UI { TemplateWidget::TemplateWidget() : _more_info_button(_("More info")) - , _short_description_label(_(" ")) + , _short_description_label(" ") , _template_name_label(_("no template selected")) , _effect_prefs(NULL) { diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index 6c7867633..3b51147e0 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -98,6 +98,7 @@ ToolBase::ToolBase() { this->hot_x = 0; this->yp = 0; this->within_tolerance = false; + this->is_dragging = false; this->tolerance = 0; //this->key = 0; this->item_to_select = 0; @@ -977,12 +978,15 @@ gint sp_event_context_root_handler(ToolBase * event_context, gint sp_event_context_virtual_root_handler(ToolBase * event_context, GdkEvent * event) { gint ret = false; - if (event_context) { // If no event-context is available then do nothing, otherwise Inkscape would crash - // (see the comment in SPDesktop::set_event_context, and bug LP #622350) - //ret = (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(event_context)))->root_handler(event_context, event); - ret = event_context->root_handler(event); + if (event_context) { + if(event->type == GDK_BUTTON_PRESS) + event_context->is_dragging = true; + ret = event_context->root_handler(event); set_event_location(event_context->desktop, event); + + if(event->type == GDK_BUTTON_RELEASE) + event_context->is_dragging = false; } return ret; } diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h index 7ed5875b1..ab8bd8caa 100644 --- a/src/ui/tools/tool-base.h +++ b/src/ui/tools/tool-base.h @@ -118,6 +118,8 @@ public: gint xp, yp; ///< where drag started gint tolerance; + bool is_dragging; // Is a tool currently dragging something + bool within_tolerance; ///< are we still within tolerance of origin SPItem *item_to_select; ///< the item where mouse_press occurred, to |