X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_bline.cpp;h=0b61bb18a06c5f91f914ded5b0346334aade12bc;hb=b08d1e8f61500392efbe15e599245d3b68e55594;hp=9211a076c7772d35dddf7d9da474a7d768a6cec6;hpb=c3ad95144d148602f672e95ddda1f18fc35502f8;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp index 9211a07..0b61bb1 100644 --- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp @@ -186,10 +186,10 @@ public: bool run_(); bool run(); - bool no_egress_on_selection_change; + bool egress_on_selection_change; Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/) { - if(!no_egress_on_selection_change) + if(egress_on_selection_change) throw Smach::egress_exception(); return Smach::RESULT_OK; } @@ -324,7 +324,7 @@ StateBLine_Context::StateBLine_Context(CanvasView* canvas_view): canvas_view_(canvas_view), is_working(*canvas_view), loop_(false), - prev_workarea_layer_status_(get_work_area()->allow_layer_clicks), + prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()), duckmatic_push(get_work_area()), settings(synfigapp::Main::get_selected_input_device()->settings()), entry_id(), @@ -338,7 +338,7 @@ StateBLine_Context::StateBLine_Context(CanvasView* canvas_view): spin_feather(adj_feather,0.01,4) { depth=-1; - no_egress_on_selection_change=false; + egress_on_selection_change=true; load_settings(); // Set up the tool options dialog @@ -357,7 +357,7 @@ StateBLine_Context::StateBLine_Context(CanvasView* canvas_view): App::dialog_tool_options->present(); // Turn off layer clicking - get_work_area()->allow_layer_clicks=false; + get_work_area()->set_allow_layer_clicks(false); // clear out the ducks get_work_area()->clear_ducks(); @@ -425,7 +425,7 @@ StateBLine_Context::~StateBLine_Context() get_canvas_view()->work_area->reset_cursor(); // Restore layer clicking - get_work_area()->allow_layer_clicks=prev_workarea_layer_status_; + get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_); // Enable the time bar get_canvas_view()->set_sensitive_timebar(true); @@ -695,10 +695,10 @@ StateBLine_Context::run_() }*/ } - no_egress_on_selection_change=true; + egress_on_selection_change=false; get_canvas_interface()->get_selection_manager()->clear_selected_layers(); get_canvas_interface()->get_selection_manager()->set_selected_layers(layer_selection); - no_egress_on_selection_change=false; + egress_on_selection_change=true; //if(finish_bline_dialog.get_region_flag() || finish_bline_dialog.get_bline_flag()) // get_canvas_interface()->signal_dirty_preview()();