projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a new signal_subcanvas_changed() that is signalled whenever a PasteCanvas' subcan...
[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
fa74332
..
00fafd9
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
@@
-6,7
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-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;
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)
//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)
}
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;
}
break;
@@
-784,7
+783,7
@@
CellRenderer_TimeTrack::activate_vfunc(
/*if(event->button.button==3 && selection)
{
/*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;
}
*/
return true;
}
*/
@@
-846,7
+845,7
@@
CellRenderer_TimeTrack::activate_vfunc(
/*if(value_node && selection)
{
if(selected_time==drag_time && event->button.button!=3)
/*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)
{
else
if(event->button.button==1)
{
@@
-905,9
+904,3
@@
CellRenderer_TimeTrack::set_canvas_interface(etl::loose_handle<synfigapp::Canvas
{
canvas_interface_ = h;
}
{
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);
-}