X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_draw.cpp;h=063b3a7d36874b0efa9a291c42529f6ffdfdb621;hb=5191f9f9c8a40f70a7e2a7ef1dc99264359c6ec2;hp=b8c90f325318f3dff6be7ae580ed06545f9ff3a4;hpb=7c7a0076ee45cffd2165eefe4ede81e4a631ac18;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
index b8c90f3..063b3a7 100644
--- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
@@ -115,6 +115,7 @@ class studio::StateDraw_Context : public sigc::trackable
 	Duckmatic::Type old_duckmask;
 
 	void fill_last_stroke();
+	void fill_last_stroke_and_unselect_other_layers();
 
 	Smach::event_result new_bline(std::list<synfig::BLinePoint> bline,bool loop_bline_flag,float radius);
 
@@ -376,7 +377,7 @@ StateDraw_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());
 	}
@@ -424,8 +425,6 @@ StateDraw_Context::StateDraw_Context(CanvasView* canvas_view):
 	check_localerror(_("LocalError"))
 
 {
-	synfig::info("STATE SKETCH: entering state");
-
 	nested=0;
 	load_settings();
 
@@ -715,14 +714,16 @@ StateDraw_Context::process_stroke(StrokeData stroke_data, WidthData width_data,
 	}
 
 	// If the start and end points are similar, then make them the same point
-	if(get_auto_loop_flag() &&
-	   bline.size()>2&&(bline.front().get_vertex()-bline.back().get_vertex()).mag()<=radius)
+	if (get_auto_loop_flag() &&
+		bline.size() > 2 &&
+		(bline.front().get_vertex() - bline.back().get_vertex()).mag() <= radius)
 	{
 		loop_bline_flag=true;
 		Vector tangent;
 		Real width(0);
 
-		while(bline.size()>2&&(bline.front().get_vertex()-bline.back().get_vertex()).mag()<=radius)
+		while (bline.size() > 2 &&
+			   (bline.front().get_vertex() - bline.back().get_vertex()).mag() <= radius)
 		{
 			tangent=bline.back().get_tangent1();
 			width=bline.back().get_width();
@@ -752,8 +753,15 @@ StateDraw_Context::process_stroke(StrokeData stroke_data, WidthData width_data,
 	}
 
 	// If the bline only has one blinepoint, then there is nothing to do.
-	if(bline.size()<=1)
+	if(bline.size() < 2)
+	{
+		// hide the 'stroke' line we were drawing, unless the user
+		// explicitly requests that they are kept
+		if (!getenv("SYNFIG_KEEP_ABORTED_DRAW_LINES"))
+			refresh_ducks();
+
 		return Smach::RESULT_OK;
+	}
 
 	if(region_flag)
 		return new_region(bline,radius);
@@ -764,6 +772,8 @@ StateDraw_Context::process_stroke(StrokeData stroke_data, WidthData width_data,
 Smach::event_result
 StateDraw_Context::new_bline(std::list<synfig::BLinePoint> bline,bool loop_bline_flag,float radius)
 {
+	synfigapp::SelectionManager::LayerList layer_list = get_canvas_view()->get_selection_manager()->get_selected_layers();
+
 	// Create the action group
 	synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Sketch BLine"));
 
@@ -924,6 +934,11 @@ StateDraw_Context::new_bline(std::list<synfig::BLinePoint> bline,bool loop_bline
 			trans_bline.push_back(bline_point);
 		}
 		value_node=ValueNode_BLine::create(synfig::ValueBase(trans_bline,loop_bline_flag));
+
+		Canvas::Handle canvas(get_canvas_view()->get_canvas());
+		Layer::Handle layer(get_canvas_view()->get_selection_manager()->get_selected_layer());
+		if (layer) canvas=layer->get_canvas();
+		value_node->set_member_canvas(canvas);
 	}
 
 	Smach::event_result result;
@@ -994,8 +1009,7 @@ StateDraw_Context::new_bline(std::list<synfig::BLinePoint> bline,bool loop_bline
 		LinkableValueNode::Handle::cast_dynamic(value_node->list.back().value_node)->
 		  set_link(0,finish_duck_value_desc.get_value_node());
 
-	if(get_auto_export_flag()) {
-		printf("this is where we would export the new line\n");
+	if(get_auto_export_flag())
 		if (!get_canvas_interface()->add_value_node(value_node,get_id()))
 		{
 			/* it's no big deal, is it?  let's keep the shape anyway */
@@ -1004,7 +1018,6 @@ StateDraw_Context::new_bline(std::list<synfig::BLinePoint> bline,bool loop_bline
 			// increment_id();
 			// return Smach::RESULT_ERROR;
 		}
-	}
 
 	last_stroke=value_node;
 	last_stroke_id=get_id();
@@ -1025,7 +1038,7 @@ StateDraw_Context::new_bline(std::list<synfig::BLinePoint> bline,bool loop_bline
 
 		// fill_last_stroke() will take care of clearing the selection if we're calling it
 		if(get_outline_flag() && get_region_flag())
-			fill_last_stroke();
+			fill_last_stroke_and_unselect_other_layers();
 		else
 			get_canvas_interface()->get_selection_manager()->clear_selected_layers();
 
@@ -1078,7 +1091,8 @@ StateDraw_Context::new_bline(std::list<synfig::BLinePoint> bline,bool loop_bline
 			//refresh_ducks();
 			return Smach::RESULT_ERROR;
 		}
-		get_canvas_view()->get_selection_manager()->set_selected_layer(layer);
+		layer_list.push_back(layer);
+		get_canvas_view()->get_selection_manager()->set_selected_layers(layer_list);
 		//refresh_ducks();
 	}
 
@@ -1933,7 +1947,7 @@ StateDraw_Context::reverse_bline(std::list<synfig::BLinePoint> &bline)
 }
 
 void
-StateDraw_Context::fill_last_stroke()
+StateDraw_Context::fill_last_stroke_and_unselect_other_layers()
 {
 	if(!last_stroke)
 		return;
@@ -1982,3 +1996,14 @@ StateDraw_Context::fill_last_stroke()
 	}
 	get_canvas_view()->get_selection_manager()->set_selected_layer(layer);
 }
+
+void
+StateDraw_Context::fill_last_stroke()
+{
+	if(!last_stroke)
+		return;
+
+	synfigapp::SelectionManager::LayerList layer_list = get_canvas_view()->get_selection_manager()->get_selected_layers();
+	fill_last_stroke_and_unselect_other_layers();
+	get_canvas_view()->get_selection_manager()->set_selected_layers(layer_list);
+}