X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_gradient.cpp;h=c8461b5deb23a299f941434e8434e1ed26842245;hb=d76982128319a00cb5fc30a119304865da55d8cf;hp=40deb658c6b623851eaf865428adaa297001b09d;hpb=62136261cc9eed43f117b46c61361dda07dfce97;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_gradient.cpp b/synfig-studio/trunk/src/gtkmm/state_gradient.cpp
index 40deb65..c8461b5 100644
--- a/synfig-studio/trunk/src/gtkmm/state_gradient.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_gradient.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**  Copyright (c) 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -263,8 +264,8 @@ StateGradient_Context::StateGradient_Context(CanvasView* canvas_view):
 {
 	egress_on_selection_change=true;
 	// Set up the tool options dialog
-	///options_table.attach(*manage(new Gtk::Label(_("Gradient Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-	options_table.attach(entry_id, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(*manage(new Gtk::Label(_("Gradient Tool"))),	0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(entry_id,										0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 
 	enum_type.set_param_desc(ParamDesc("type")
 		.set_local_name(_("Gradient Type"))
@@ -403,6 +404,12 @@ StateGradient_Context::make_gradient(const Point& _p1, const Point& _p2)
 	case GRADIENT_INTERPOLATION_LINEAR:
 
 		layer=get_canvas_interface()->add_layer_to("linear_gradient",canvas,depth);
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
+		}
 		layer->set_param("p1",p1);
 		get_canvas_interface()->signal_layer_param_changed()(layer,"p1");
 		layer->set_param("p2",p2);
@@ -410,6 +417,12 @@ StateGradient_Context::make_gradient(const Point& _p1, const Point& _p2)
 		break;
 	case GRADIENT_RADIAL:
 		layer=get_canvas_interface()->add_layer_to("radial_gradient",canvas,depth);
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
+		}
 		layer->set_param("center",p1);
 		get_canvas_interface()->signal_layer_param_changed()(layer,"center");
 		layer->set_param("radius",(p2-p1).mag());
@@ -417,6 +430,12 @@ StateGradient_Context::make_gradient(const Point& _p1, const Point& _p2)
 		break;
 	case GRADIENT_CONICAL:
 		layer=get_canvas_interface()->add_layer_to("conical_gradient",canvas,depth);
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
+		}
 		layer->set_param("center",p1);
 		get_canvas_interface()->signal_layer_param_changed()(layer,"center");
 		{
@@ -427,6 +446,12 @@ StateGradient_Context::make_gradient(const Point& _p1, const Point& _p2)
 		break;
 	case GRADIENT_SPIRAL:
 		layer=get_canvas_interface()->add_layer_to("spiral_gradient",canvas,depth);
+		if (!layer)
+		{
+			get_canvas_view()->get_ui_interface()->error(_("Unable to create layer"));
+			group.cancel();
+			return;
+		}
 		layer->set_param("center",p1);
 		get_canvas_interface()->signal_layer_param_changed()(layer,"center");
 		layer->set_param("radius",(p2-p1).mag());
@@ -493,6 +518,7 @@ StateGradient_Context::event_mouse_click_handler(const Smach::event& x)
 
 	if(event.key==EVENT_WORKAREA_MOUSE_BUTTON_DRAG && event.button==BUTTON_LEFT)
 	{
+		if (!point2_duck) return Smach::RESULT_OK;
 		point2_duck->set_point(get_work_area()->snap_point_to_grid(event.pos));
 		get_work_area()->queue_draw();
 		return Smach::RESULT_ACCEPT;