From 03018c2f56855c6c9006f7feace63febdef7bc52 Mon Sep 17 00:00:00 2001 From: Stefano Facchini Date: Fri, 20 Oct 2017 17:10:39 +0200 Subject: Refactor SPDesktop::setEventContext to allow for unsetting the current tool Passing the empty string as toolName has the effect of unsetting and freeing the current tool. This will be used in a future commit. --- src/desktop.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 1264e0184..61a64fe22 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -228,7 +228,7 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid controls = (SPCanvasGroup *) sp_canvas_item_new (main, SP_TYPE_CANVAS_GROUP, NULL); // Set the select tool as the active tool. - set_event_context2("/tools/select"); + setEventContext("/tools/select"); // display rect and zoom are now handled in sp_desktop_widget_realize() @@ -656,34 +656,34 @@ SPDesktop::change_document (SPDocument *theDocument) } /** - * Replaces the currently active tool with a new one. + * Replaces the currently active tool with a new one. Pass the empty string to + * unset and free the current tool. */ -void SPDesktop::set_event_context2(const std::string& toolName) +void SPDesktop::setEventContext(const std::string& toolName) { - Inkscape::UI::Tools::ToolBase* old_tool = event_context; - - if (old_tool) { - if (toolName.compare(old_tool->pref_observer->observed_path) != 0) { - //g_message("Old tool: %s", old_tool->pref_observer->observed_path.c_str()); - //g_message("New tool: %s", toolName.c_str()); - old_tool->finish(); - delete old_tool; + if (event_context) { + if (toolName.compare(event_context->pref_observer->observed_path) != 0) { + event_context->finish(); + delete event_context; } else { _event_context_changed_signal.emit(this, event_context); return; } } - - Inkscape::UI::Tools::ToolBase* new_tool = ToolFactory::createObject(toolName); - new_tool->desktop = this; - new_tool->message_context = new Inkscape::MessageContext(this->messageStack()); - event_context = new_tool; - new_tool->setup(); - - // Make sure no delayed snapping events are carried over after switching tools - // (this is only an additional safety measure against sloppy coding, because each - // tool should take care of this by itself) - sp_event_context_discard_delayed_snap_event(event_context); + + if (toolName.empty()) { + event_context = nullptr; + } else { + event_context = ToolFactory::createObject(toolName); + event_context->desktop = this; + event_context->message_context = new Inkscape::MessageContext(this->messageStack()); + event_context->setup(); + + // Make sure no delayed snapping events are carried over after switching tools + // (this is only an additional safety measure against sloppy coding, because each + // tool should take care of this by itself) + sp_event_context_discard_delayed_snap_event(event_context); + } _event_context_changed_signal.emit(this, event_context); } -- cgit v1.2.3 From 2adf86d21d42f7d225e0d2188109fbd031989cf4 Mon Sep 17 00:00:00 2001 From: Stefano Facchini Date: Fri, 20 Oct 2017 22:40:38 +0200 Subject: Unset the current tool early on shutdown. Before this commit, when the application is terminated we call the ::finish() method for the current tool, only after deleting the selection and other objects. But it may happen that the tool's finish() assume that the selection is still alive, making the application crash. (For instance, with the Bezier tool when the path is still not closed). Instead, unset the current tool early, when the Desktop object is removed from the application, before calling its ::destroy() method. --- src/desktop.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 61a64fe22..f798079fd 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -322,7 +322,6 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid // canvas_debug = sp_canvas_item_new (main, SP_TYPE_CANVAS_DEBUG, NULL); } - void SPDesktop::destroy() { _destroy_signal.emit(this); @@ -331,6 +330,7 @@ void SPDesktop::destroy() delete snapindicator; snapindicator = NULL; } + if (temporary_item_list) { delete temporary_item_list; temporary_item_list = NULL; @@ -356,12 +356,6 @@ void SPDesktop::destroy() g_signal_handlers_disconnect_by_func(G_OBJECT (main), (gpointer) G_CALLBACK(sp_desktop_root_handler), this); g_signal_handlers_disconnect_by_func(G_OBJECT (drawing), (gpointer) G_CALLBACK(_arena_handler), this); - if (event_context) { - event_context->finish(); - delete event_context; - event_context = NULL; - } - delete layers; if (layer_manager) { -- cgit v1.2.3