X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_draw.cpp;h=4d053bcff00b54fc7745e3f07caaaa8c07d9e0c1;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=1d5666cdf1f0e2df697b233e60fbd0596d35fcd6;hpb=04295e119995f2bf29f75be0d0aec22e93bc0fad;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp index 1d5666c..4d053bc 100644 --- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp @@ -589,10 +589,6 @@ StateDraw_Context::event_mouse_down_handler(const Smach::event& x) return Smach::RESULT_ACCEPT; } - case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu - if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS")) - return Smach::RESULT_ACCEPT; - default: return Smach::RESULT_OK; } @@ -629,7 +625,7 @@ StateDraw_Context::event_stroke(const Smach::event& x) assert(event.stroke_data); - get_work_area()->add_stroke(event.stroke_data,synfigapp::Main::get_foreground_color()); + get_work_area()->add_stroke(event.stroke_data,synfigapp::Main::get_outline_color()); if(nested==0) { @@ -681,7 +677,7 @@ StateDraw_Context::process_stroke(StrokeData stroke_data, WidthData width_data, } } - //get_work_area()->add_stroke(event.stroke_data,synfigapp::Main::get_foreground_color()); + //get_work_area()->add_stroke(event.stroke_data,synfigapp::Main::get_outline_color()); //stroke_list.push_back(event.stroke_data); //refresh_ducks(); @@ -1093,7 +1089,7 @@ StateDraw_Context::new_bline(std::list bline,bool loop_bline get_canvas_interface()-> change_value(synfigapp::ValueDesc(layer,"origin"),shift_origin_vector); - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); @@ -1559,7 +1555,7 @@ StateDraw_Context::new_region(std::list bline, synfig::Real // synfig::info(__FILE__":%d: value_prev 0x%08X:%d",__LINE__,value_prev.get_parent_value_node().get(),value_prev.get_index()); // synfig::info(__FILE__":%d: value_desc 0x%08X:%d",__LINE__,value_desc.get_parent_value_node().get(),value_desc.get_index()); // synfig::info(__FILE__":%d: value_next 0x%08X:%d",__LINE__,value_next.get_parent_value_node().get(),value_next.get_index()); - + /* if(value_prev.parent_is_value_node() && value_desc.parent_is_value_node() && value_next.parent_is_value_node()) { @@ -1609,7 +1605,7 @@ StateDraw_Context::new_region(std::list bline, synfig::Real // (*(value_desc.get_parent_value_node()))(get_time()).get_loop() // // value_desc.get_value_node().get_loop(), // ); - // + // // // Fill in missing vertices // // \todo take loops into account: seeing (15, 2, 3, 4) probably means that (0, 1) is missing, not 14 through 3 // if(value_desc.get_index() bline, synfig::Real group.cancel(); return Smach::RESULT_ERROR; } - layer->set_param("color",synfigapp::Main::get_background_color()); + if(get_feather()) { layer->set_param("feather",get_feather()); @@ -1810,7 +1806,7 @@ StateDraw_Context::new_region(std::list bline, synfig::Real } get_canvas_interface()->signal_layer_param_changed()(layer,"color"); - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action); @@ -1862,7 +1858,7 @@ StateDraw_Context::extend_bline_from_begin(ValueNode_BLine::Handle value_node,st if (complete_loop) { - synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_loop")); + synfigapp::Action::Handle action(synfigapp::Action::create("ValueNodeDynamicListLoop")); assert(action); action->set_param("canvas",get_canvas()); @@ -1882,7 +1878,7 @@ StateDraw_Context::extend_bline_from_begin(ValueNode_BLine::Handle value_node,st { ValueNode_Composite::Handle composite(ValueNode_Composite::create(*iter)); - synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_insert")); + synfigapp::Action::Handle action(synfigapp::Action::create("ValueNodeDynamicListInsert")); assert(action); synfigapp::ValueDesc value_desc(value_node,0); @@ -1913,7 +1909,7 @@ StateDraw_Context::extend_bline_from_end(ValueNode_BLine::Handle value_node,std: if (complete_loop) { - synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_loop")); + synfigapp::Action::Handle action(synfigapp::Action::create("ValueNodeDynamicListLoop")); assert(action); action->set_param("canvas",get_canvas()); @@ -1933,7 +1929,7 @@ StateDraw_Context::extend_bline_from_end(ValueNode_BLine::Handle value_node,std: { ValueNode_Composite::Handle composite(ValueNode_Composite::create(*iter)); - synfigapp::Action::Handle action(synfigapp::Action::create("value_node_dynamic_list_insert")); + synfigapp::Action::Handle action(synfigapp::Action::create("ValueNodeDynamicListInsert")); assert(action); synfigapp::ValueDesc value_desc(value_node,value_node->link_count()); @@ -2000,10 +1996,9 @@ StateDraw_Context::fill_last_stroke_and_unselect_other_layers() get_canvas_interface()->get_selection_manager()->clear_selected_layers(); layer=get_canvas_interface()->add_layer_to("region", canvas, depth); if (!layer) return Smach::RESULT_ERROR; - layer->set_param("color",synfigapp::Main::get_background_color()); layer->set_description(last_stroke_id + _(" Region")); - synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect")); + synfigapp::Action::Handle action(synfigapp::Action::create("LayerParamConnect")); assert(action);