From cdf669d01c5b35cad39a4c7a2bd16041c2216e1b Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sun, 6 Oct 2013 13:24:36 -0400 Subject: Order of message setting for tools Fixed bugs: - https://launchpad.net/bugs/1235792 (bzr r12664) --- src/tools-switch.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/tools-switch.cpp') diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp index a3c0f2daa..1c07f07cc 100644 --- a/src/tools-switch.cpp +++ b/src/tools-switch.cpp @@ -143,7 +143,9 @@ tools_active(SPDesktop *dt) void tools_switch(SPDesktop *dt, int num) { + dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, gettext( tool_msg[num] ) ); if (dt) { + // This event may change the above message dt->_tool_changed.emit(num); } @@ -152,7 +154,6 @@ tools_switch(SPDesktop *dt, int num) /* First 4 tools use guides, first is undefined but we don't care */ dt->activate_guides(num < 5); inkscape_eventcontext_set(dt->getEventContext()); - dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, gettext( tool_msg[num] ) ); } void tools_switch_by_item(SPDesktop *dt, SPItem *item, Geom::Point const p) -- cgit v1.2.3