X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_draw.cpp;h=10f050e92b0046d07923b64dedc3a939eeb852d9;hb=ab058f0ef6558002cc82022cc9d91d1cf5e8a88f;hp=79c478879b84d81677fc22081d3e5f5bdd07036f;hpb=45d32acc437f1ea60269d51bbbb97845cee2dfc9;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
index 79c4788..10f050e 100644
--- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
@@ -115,7 +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 fill_last_stroke_and_unselect_other_layers();
 
 	Smach::event_result new_bline(std::list<synfig::BLinePoint> bline,bool loop_bline_flag,float radius);
 
@@ -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;
 	}
@@ -1038,7 +1034,15 @@ 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_and_unselect_other_layers();
+		{
+			if (fill_last_stroke_and_unselect_other_layers() == Smach::RESULT_ERROR)
+			{
+				get_canvas_view()->get_selection_manager()->set_selected_layers(layer_list);
+				get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+				group.cancel();
+				return Smach::RESULT_ERROR;
+			}
+		}
 		else
 			get_canvas_interface()->get_selection_manager()->clear_selected_layers();
 
@@ -1050,11 +1054,25 @@ StateDraw_Context::new_bline(std::list<synfig::BLinePoint> bline,bool loop_bline
 		if(get_outline_flag())
 		{
 			layer=get_canvas_interface()->add_layer_to("outline",canvas,depth);
+			if (!layer)
+			{
+				get_canvas_view()->get_selection_manager()->set_selected_layers(layer_list);
+				get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+				group.cancel();
+				return Smach::RESULT_ERROR;
+			}
 			layer->set_description(get_id()+_(" Outline"));
 		}
 		else
 		{
 			layer=get_canvas_interface()->add_layer_to("region",canvas,depth);
+			if (!layer)
+			{
+				get_canvas_view()->get_selection_manager()->set_selected_layers(layer_list);
+				get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+				group.cancel();
+				return Smach::RESULT_ERROR;
+			}
 			layer->set_description(get_id()+_(" Region"));
 		}
 
@@ -1273,7 +1291,7 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 
 	std::list<synfigapp::ValueDesc> vertex_list;
 
-	printf("new_region with %d bline points\n", bline.size());
+	printf("new_region with %zd bline points\n", bline.size());
 
 	// First we need to come up with a rough list of
 	// BLinePoints that we are going to be using to
@@ -1316,7 +1334,7 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 
 	assert(vertex_list.back().is_valid());
 
-	printf("vertex list with %d bline points\n", vertex_list.size());
+	printf("vertex list with %zd bline points\n", vertex_list.size());
 
 	// Remove any duplicates
 	{
@@ -1774,7 +1792,12 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 		synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
 
 		layer=get_canvas_interface()->add_layer_to("region",canvas,depth);
-		assert(layer);
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return Smach::RESULT_ERROR;
+		}
 		layer->set_param("color",synfigapp::Main::get_background_color());
 		if(get_feather())
 		{
@@ -1946,11 +1969,11 @@ StateDraw_Context::reverse_bline(std::list<synfig::BLinePoint> &bline)
 	}
 }
 
-void
+Smach::event_result
 StateDraw_Context::fill_last_stroke_and_unselect_other_layers()
 {
 	if(!last_stroke)
-		return;
+		return Smach::RESULT_OK;
 
 	synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Fill Stroke"));
 
@@ -1972,7 +1995,7 @@ 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);
-	assert(layer);
+	if (!layer) return Smach::RESULT_ERROR;
 	layer->set_param("color",synfigapp::Main::get_background_color());
 	layer->set_description(last_stroke_id + _(" Region"));
 
@@ -1992,9 +2015,10 @@ StateDraw_Context::fill_last_stroke_and_unselect_other_layers()
 	{
 		get_canvas_view()->get_ui_interface()->error(_("Unable to create Region layer"));
 		group.cancel();
-		return;
+		return Smach::RESULT_OK;
 	}
 	get_canvas_view()->get_selection_manager()->set_selected_layer(layer);
+	return Smach::RESULT_OK;
 }
 
 void