#include <synfig/valuenode_dynamiclist.h>
#include "state_sketch.h"
+#include "state_normal.h"
#include "state_stroke.h"
#include "canvasview.h"
#include "workarea.h"
}
StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
- action_group(Gtk::ActionGroup::create()),
+ action_group(Gtk::ActionGroup::create("action_group_state_sketch")),
canvas_view_(canvas_view),
is_working(*canvas_view),
prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()),
// Turn off layer clicking
get_work_area()->set_allow_layer_clicks(false);
- get_canvas_view()->work_area->set_cursor(Gdk::PENCIL);
+ get_work_area()->set_cursor(Gdk::PENCIL);
// Turn off duck clicking
get_work_area()->set_allow_duck_clicks(false);
StateSketch_Context::~StateSketch_Context()
{
- get_canvas_view()->work_area->reset_cursor();
+ get_work_area()->reset_cursor();
App::dialog_tool_options->clear();
Smach::event_result
StateSketch_Context::event_stop_handler(const Smach::event& /*x*/)
{
- throw Smach::egress_exception();
+ //throw Smach::egress_exception();
+ throw &state_normal;
+ return Smach::RESULT_OK;
}
Smach::event_result