projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'nikitakit_svg'
[synfig.git]
/
synfig-studio
/
src
/
gtkmm
/
state_circle.cpp
diff --git
a/synfig-studio/src/gtkmm/state_circle.cpp
b/synfig-studio/src/gtkmm/state_circle.cpp
index
fe82e21
..
ce155b0
100644
(file)
--- a/
synfig-studio/src/gtkmm/state_circle.cpp
+++ b/
synfig-studio/src/gtkmm/state_circle.cpp
@@
-38,6
+38,7
@@
#include <synfig/valuenode_bline.h>
#include "state_circle.h"
#include <synfig/valuenode_bline.h>
#include "state_circle.h"
+#include "state_normal.h"
#include "canvasview.h"
#include "workarea.h"
#include "app.h"
#include "canvasview.h"
#include "workarea.h"
#include "app.h"
@@
-208,7
+209,7
@@
public:
Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/)
{
if(egress_on_selection_change)
Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/)
{
if(egress_on_selection_change)
- throw Smach::egress_exception();
+ throw
&state_normal; //throw
Smach::egress_exception();
return Smach::RESULT_OK;
}
return Smach::RESULT_OK;
}
@@
-483,7
+484,7
@@
options_table.attach(*manage(new Gtk::Label(_("Point Angle Offset:"))), 0, 1, 14
// Connect a signal
//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateCircle_Context::on_user_click));
// Connect a signal
//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateCircle_Context::on_user_click));
- get_
canvas_view()->work_area
->set_cursor(Gdk::CROSSHAIR);
+ get_
work_area()
->set_cursor(Gdk::CROSSHAIR);
App::toolbox->refresh();
}
App::toolbox->refresh();
}
@@
-510,7
+511,7
@@
StateCircle_Context::~StateCircle_Context()
// Restore layer clicking
get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_);
// Restore layer clicking
get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_);
- get_
canvas_view()->work_area
->reset_cursor();
+ get_
work_area()
->reset_cursor();
App::dialog_tool_options->clear();
App::dialog_tool_options->clear();
@@
-531,7
+532,9
@@
StateCircle_Context::~StateCircle_Context()
Smach::event_result
StateCircle_Context::event_stop_handler(const Smach::event& /*x*/)
{
Smach::event_result
StateCircle_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