X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_timetrack.cpp;h=3f93fa6972d31492c269d550d31187b8b370a7ff;hb=9738366966c905c2b0b4ffa77ece7a3d317e32cd;hp=b3dc0bfc7911fa42aa13364d7b9fb3bff9bf8c34;hpb=949269a8e154acf600f227f7e23ad70232b550ae;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index b3dc0bf..3f93fa6 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 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
@@ -69,7 +69,7 @@ class TimeTrackView : public Gtk::TreeView
 	Gtk::TreeView *mimic_tree_view;
 public:
 
-	sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint, std::less<UniqueID> >,int,synfig::Waypoint::Side> signal_waypoint_clicked_timetrackview;
+	sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint, std::less<UniqueID> >,int> signal_waypoint_clicked_timetrackview;
 
 	LayerParamTreeStore::Model model;
 
@@ -89,7 +89,7 @@ public:
 			// Set up the value-node cell-renderer
 			cellrenderer_time_track=LayerParamTreeStore::add_cell_renderer_value_node(column);
 			cellrenderer_time_track->property_mode()=Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
-			cellrenderer_time_track->signal_waypoint_clicked_cellrenderer().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_clicked_timetrackview) );
+			cellrenderer_time_track->signal_waypoint_clicked_cellrenderer().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_clicked_timetrackview));
 			cellrenderer_time_track->signal_waypoint_changed().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_changed) );
 			column->add_attribute(cellrenderer_time_track->property_value_desc(), model.value_desc);
 			column->add_attribute(cellrenderer_time_track->property_canvas(), model.canvas);
@@ -102,7 +102,6 @@ public:
 			column->set_resizable();
 			column->set_min_width(200);
 
-
 			append_column(*column);
 		}
 		set_rules_hint();
@@ -225,7 +224,9 @@ public:
 
 				Gtk::TreeRow row = *(get_model()->get_iter(path));
 
-				if((event->motion.state&GDK_BUTTON1_MASK ||event->motion.state&GDK_BUTTON3_MASK) && column && cellrenderer_time_track==column->get_first_cell_renderer())
+				if ((event->motion.state&GDK_BUTTON1_MASK || event->motion.state&GDK_BUTTON3_MASK) &&
+					column &&
+					cellrenderer_time_track == column->get_first_cell_renderer())
 				{
 					Gdk::Rectangle rect;
 					get_cell_area(path,*column,rect);
@@ -307,6 +308,9 @@ public:
 	void
 	on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node)
 	{
+		// is this code used?
+		assert(0);
+
 		synfigapp::Action::ParamList param_list;
 		param_list.add("canvas",param_tree_store_->canvas_interface()->get_canvas());
 		param_list.add("canvas_interface",param_tree_store_->canvas_interface());
@@ -346,7 +350,6 @@ public:
 
 	void mimic_resync()
 	{
-
 		if(mimic_tree_view)
 		{
 			Gtk::Adjustment &adjustment(*mimic_tree_view->get_vadjustment());
@@ -369,40 +372,25 @@ public:
 	on_waypoint_clicked_timetrackview(const etl::handle<synfig::Node>& node,
 									  const synfig::Time& time,
 									  const synfig::Time& time_offset __attribute__ ((unused)),
-									  int button,
-									  synfig::Waypoint::Side side)
+									  int button)
 	{
 		std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
-		int n=synfig::waypoint_collect(waypoint_set,time,node);
+		synfig::waypoint_collect(waypoint_set,time,node);
 
 		synfigapp::ValueDesc value_desc;
-		bool first = true;
-		if(!waypoint_set.empty())
-		{
-			for (std::set<synfig::Waypoint, std::less<UniqueID> >::iterator iter = waypoint_set.begin(); iter != waypoint_set.end(); iter++)
-			{
-				ValueNode::Handle value_node(iter->get_parent_value_node());
-				assert(value_node);
-
-				Gtk::TreeRow row;
-				if(!param_tree_store_->find_first_value_node(value_node, row))
-				{
-					synfig::error(__FILE__":%d: Unable to find the valuenode",__LINE__);
-					return;
-				}
 
-				if(!row)
-					return;
-
-				if (first)
-				{
-					value_desc = static_cast<synfigapp::ValueDesc>(row[model.value_desc]);
-					first = false;
-				}
-			}
+		if (waypoint_set.size() == 1)
+		{
+			ValueNode::Handle value_node(waypoint_set.begin()->get_parent_value_node());
+			assert(value_node);
 
-			signal_waypoint_clicked_timetrackview(value_desc,waypoint_set,button,side);
+			Gtk::TreeRow row;
+			if (param_tree_store_->find_first_value_node(value_node, row) && row)
+				value_desc = static_cast<synfigapp::ValueDesc>(row[model.value_desc]);
 		}
+
+		if (!waypoint_set.empty())
+			signal_waypoint_clicked_timetrackview(value_desc,waypoint_set,button);
 	}
 };
 
@@ -456,7 +444,6 @@ Dock_Timetrack::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view
 
 	tree_view->signal_waypoint_clicked_timetrackview.connect(sigc::mem_fun(*canvas_view, &studio::CanvasView::on_waypoint_clicked_canvasview));
 
-
 	canvas_view->time_adjustment().signal_value_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw));
 	canvas_view->time_adjustment().signal_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw));
 
@@ -498,7 +485,6 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_v
 		table_=0;
 	}
 
-
 	if(canvas_view)
 	{
 		TimeTrackView* tree_view(dynamic_cast<TimeTrackView*>(canvas_view->get_ext_widget(get_name())));