Reformatted a little.

[synfig.git] / synfig-studio / trunk / src / gtkmm / dock_timetrack.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index b3dc0bf..9e938de 100644 (file)
--- 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;
 
@@ -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);
@@ -346,7 +347,6 @@ public:
 
        void mimic_resync()
        {
-
                if(mimic_tree_view)
                {
                        Gtk::Adjustment &adjustment(*mimic_tree_view->get_vadjustment());
@@ -373,36 +373,22 @@ public:
                                                                          synfig::Waypoint::Side side)
        {
                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 +442,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 +483,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())));