projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add the real winner splash screens.
[synfig.git]
/
synfig-studio
/
src
/
gtkmm
/
state_sketch.cpp
diff --git
a/synfig-studio/src/gtkmm/state_sketch.cpp
b/synfig-studio/src/gtkmm/state_sketch.cpp
index
0cac528
..
f8b77a3
100644
(file)
--- a/
synfig-studio/src/gtkmm/state_sketch.cpp
+++ b/
synfig-studio/src/gtkmm/state_sketch.cpp
@@
-36,6
+36,7
@@
#include <synfig/valuenode_dynamiclist.h>
#include "state_sketch.h"
#include <synfig/valuenode_dynamiclist.h>
#include "state_sketch.h"
+#include "state_normal.h"
#include "state_stroke.h"
#include "canvasview.h"
#include "workarea.h"
#include "state_stroke.h"
#include "canvasview.h"
#include "workarea.h"
@@
-230,7
+231,7
@@
StateSketch_Context::toggle_show_sketch()
}
StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
}
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()),
canvas_view_(canvas_view),
is_working(*canvas_view),
prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()),
@@
-336,7
+337,7
@@
StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
// Turn off layer clicking
get_work_area()->set_allow_layer_clicks(false);
// 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);
// Turn off duck clicking
get_work_area()->set_allow_duck_clicks(false);
@@
-362,7
+363,7
@@
StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
StateSketch_Context::~StateSketch_Context()
{
StateSketch_Context::~StateSketch_Context()
{
- get_
canvas_view()->work_area
->reset_cursor();
+ get_
work_area()
->reset_cursor();
App::dialog_tool_options->clear();
App::dialog_tool_options->clear();
@@
-465,7
+466,9
@@
StateSketch_Context::event_yield_tool_options(const Smach::event& /*x*/)
Smach::event_result
StateSketch_Context::event_stop_handler(const Smach::event& /*x*/)
{
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
}
Smach::event_result