mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Timeline: Draw punch/playback/edit cursors in the overlay plane.

This commit is contained in:
Jonathan Moore Liles 2013-05-19 18:24:59 -07:00
parent dafaebb0de
commit 70e23f1994
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ntk

@ -1 +1 @@
Subproject commit 8cb721a3547f0301d03d9ad5b7f5f771e899a22c Subproject commit 5db6dfccef8b26076f2dc985ace462655c176c82

16
timeline/src/Timeline.C
View File

@ -1164,8 +1164,6 @@ Timeline::draw_clip_tracks ( void * v, int X, int Y, int W, int H )
tl->panzoomer->damage( pzd ); tl->panzoomer->damage( pzd );
tl->draw_cursors();
fl_pop_clip(); fl_pop_clip();
} }
@ -1246,12 +1244,14 @@ Timeline::draw_cursors ( Cursor_Sequence *o ) const
fl_rectf( (*i)->line_x(), tracks->y(), (*i)->abs_w(), tracks->h() ); fl_rectf( (*i)->line_x(), tracks->y(), (*i)->abs_w(), tracks->h() );
} }
else
{
fl_color( fl_color_add_alpha( (*i)->box_color(), 127 )); fl_color( fl_color_add_alpha( (*i)->box_color(), 127 ));
fl_line( (*i)->line_x(), tracks->y(), (*i)->line_x(), 9000 ); fl_line( (*i)->line_x(), tracks->y(), (*i)->line_x(), tracks->y() + tracks->h() );
fl_line( (*i)->line_x() + (*i)->abs_w(), tracks->y(), (*i)->line_x() + (*i)->abs_w(), tracks->h() ); fl_line( (*i)->line_x() + (*i)->abs_w(), tracks->y(), (*i)->line_x() + (*i)->abs_w(), tracks->y() + tracks->h() );
}
} }
} }
@ -1344,8 +1344,6 @@ Timeline::draw ( void )
draw_child(*tile); draw_child(*tile);
draw_cursors();
fl_pop_clip(); fl_pop_clip();
redraw_overlay(); redraw_overlay();
@ -1368,8 +1366,6 @@ Timeline::draw ( void )
update_child(*tile); update_child(*tile);
draw_cursors();
fl_pop_clip(); fl_pop_clip();
redraw_overlay(); redraw_overlay();
@ -1535,6 +1531,8 @@ Timeline::draw_overlay ( void )
draw_playhead(); draw_playhead();
draw_cursors();
if ( ! ( _selection.w && _selection.h ) ) if ( ! ( _selection.w && _selection.h ) )
{ {
fl_pop_clip(); fl_pop_clip();