X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_bline.cpp;h=3e87b54b59d4f7edf52f44ffaee63dfe24b2e0fb;hb=df278fa75371d2787391b98ee2ece48b307c8278;hp=56d1b6dff9a35eb1ecb81ab8bea14247891e124d;hpb=f8bc4d2360809daabbf66dbbebd92295b911bbaa;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
index 56d1b6d..3e87b54 100644
--- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
@@ -64,6 +64,9 @@ using namespace studio;
 
 /* === M A C R O S ========================================================= */
 
+// if defined, show the first duck as green while drawing
+#define DISTINGUISH_FIRST_DUCK
+
 /* === G L O B A L S ======================================================= */
 
 StateBLine studio::state_bline;
@@ -324,7 +327,7 @@ StateBLine_Context::increment_id()
 		String str_number;
 		str_number=String(id,id.size()-digits,id.size());
 		id=String(id,0,id.size()-digits);
-		synfig::info("---------------- \"%s\"",str_number.c_str());
+		// synfig::info("---------------- \"%s\"",str_number.c_str());
 
 		number=atoi(str_number.c_str());
 	}
@@ -600,6 +603,8 @@ StateBLine_Context::run_()
 		if(!canvas)
 			canvas=get_canvas_view()->get_canvas();
 
+		value_node_bline->set_member_canvas(canvas);
+
 		synfigapp::SelectionManager::LayerList layer_selection;
 
 		///////////////////////////////////////////////////////////////////////////
@@ -906,7 +911,7 @@ StateBLine_Context::event_mouse_release_handler(const Smach::event& /*x*/)
 Smach::event_result
 StateBLine_Context::event_mouse_click_handler(const Smach::event& x)
 {
-	synfig::info("STATE BLINE: Received mouse button down Event");
+	// synfig::info("STATE BLINE: Received mouse button down Event");
 	const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
 	switch(event.button)
 	{
@@ -988,7 +993,12 @@ StateBLine_Context::refresh_ducks(bool button_down)
 		// First add the duck associated with this vertex
 		duck=new WorkArea::Duck(bline_point.get_vertex());
 		duck->set_editable(true);
+#ifdef DISTINGUISH_FIRST_DUCK
+		if (iter!=bline_point_list.begin())
+			duck->set_type(Duck::TYPE_VERTEX);
+#else
 		duck->set_type(Duck::TYPE_VERTEX);
+#endif
 		duck->set_name(strprintf("%x-vertex",value_node.get()));
 		duck->signal_edited().connect(
 			sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_vertex_change),value_node)
@@ -1091,6 +1101,9 @@ StateBLine_Context::refresh_ducks(bool button_down)
 
 		duck=new WorkArea::Duck(bline_point.get_vertex());
 		duck->set_editable(true);
+#ifndef DISTINGUISH_FIRST_DUCK
+		duck->set_type(Duck::TYPE_VERTEX);
+#endif
 		duck->set_name(strprintf("%x-vertex",bline_point_list.front().get()));
 		duck->signal_edited().connect(
 			sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_vertex_change),bline_point_list.front())
@@ -1134,12 +1147,12 @@ StateBLine_Context::refresh_ducks(bool button_down)
 	if(bezier && !loop_)
 	{
 		duck=new WorkArea::Duck(bline_point.get_vertex());
-		duck->set_editable(false);
+		duck->set_ignore(true);
 		duck->set_name("temp");
 
 		// Add the tangent1 duck
 		tduck=new WorkArea::Duck(Vector(0,0));
-		tduck->set_editable(false);
+		tduck->set_ignore(true);
 		tduck->set_name("ttemp");
 		tduck->set_origin(duck);
 		tduck->set_scalar(-0.33333333333333333);