Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
index bb6d7b1..8382465 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
@@ -313,6 +313,7 @@ CellRenderer_TimeTrack::render_vfunc(
                                Time t_orig = i->get_time();
                                if(!t_orig.is_valid()) continue;
                                Time t = t_orig - time_offset;
+                               if(t<adjustment->get_lower() || t>adjustment->get_upper()) continue;
 
                                //if it found it... (might want to change comparison, and optimize
                                //                                       sel_times.find to not produce an overall nlogn solution)
@@ -765,9 +766,7 @@ CellRenderer_TimeTrack::activate_vfunc(
                                }
 
                                if(clickfound && node)
-                               {
-                                       show_timepoint_menu(node, stime, time_offset, actual_time+time_offset<stime?Waypoint::SIDE_LEFT:Waypoint::SIDE_RIGHT);
-                               }
+                                       signal_waypoint_clicked_cellrenderer()(node, stime, time_offset, 2);
                        }
 
                break;
@@ -784,7 +783,7 @@ CellRenderer_TimeTrack::activate_vfunc(
 
                        /*if(event->button.button==3 && selection)
                        {
-                               signal_waypoint_clicked_cellrenderer_(path,*selected_waypoint,event->button.button-1);
+                               signal_waypoint_clicked_cellrenderer()(path,*selected_waypoint,event->button.button-1);
                                return true;
                        }
                        */
@@ -825,15 +824,15 @@ CellRenderer_TimeTrack::activate_vfunc(
                                        if(mode & COPY_MASK) //copy
                                        {
                                                etl::handle<studio::Instance>::cast_static(canvas_interface()->get_instance())
-                                                       ->process_action("timepoint_copy", param_list);
+                                                       ->process_action("TimepointsCopy", param_list);
                                        }else if(delmode) //DELETE
                                        {
                                                etl::handle<studio::Instance>::cast_static(canvas_interface()->get_instance())
-                                                       ->process_action("timepoint_delete", param_list);
+                                                       ->process_action("TimepointsDelete", param_list);
                                        }else //MOVE
                                        {
                                                etl::handle<studio::Instance>::cast_static(canvas_interface()->get_instance())
-                                                       ->process_action("timepoint_move", param_list);
+                                                       ->process_action("TimepointsMove", param_list);
                                        }
 
                                        //now replace all the selected with the new selected
@@ -846,7 +845,7 @@ CellRenderer_TimeTrack::activate_vfunc(
                        /*if(value_node && selection)
                        {
                                if(selected_time==drag_time && event->button.button!=3)
-                                       signal_waypoint_clicked_cellrenderer_(path,*selected_waypoint,event->button.button-1);
+                                       signal_waypoint_clicked_cellrenderer()(path,*selected_waypoint,event->button.button-1);
                                else
                                if(event->button.button==1)
                                {
@@ -905,9 +904,3 @@ CellRenderer_TimeTrack::set_canvas_interface(etl::loose_handle<synfigapp::Canvas
 {
        canvas_interface_ = h;
 }
-
-void
-CellRenderer_TimeTrack::show_timepoint_menu(const etl::handle<synfig::Node>& node, const synfig::Time& time, const synfig::Time& time_offset, Waypoint::Side side)
-{
-       signal_waypoint_clicked_cellrenderer_(node,time,time_offset,2,side);
-}