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

Fix scrolling positon consistency problem.

This commit is contained in:
Jonathan Moore Liles 2008-05-05 18:49:18 -05:00
parent 89d64f66e4
commit 4947278da5
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Timeline/Timeline.C
View File

@ -513,6 +513,7 @@ Timeline::draw ( void )
/* return; */ /* return; */
/* } */ /* } */
if ( ( damage() & FL_DAMAGE_ALL ) || ( damage() & FL_DAMAGE_EXPOSE ) ) if ( ( damage() & FL_DAMAGE_ALL ) || ( damage() & FL_DAMAGE_EXPOSE ) )
{ {
DMESSAGE( "complete redraw" ); DMESSAGE( "complete redraw" );
@ -559,7 +560,7 @@ Timeline::draw ( void )
/* delete bi2; */ /* delete bi2; */
/* } */ /* } */
return; goto done;
} }
if ( damage() & FL_DAMAGE_SCROLL ) if ( damage() & FL_DAMAGE_SCROLL )
@ -581,9 +582,6 @@ Timeline::draw ( void )
fl_scroll( X, Y, W, H, dx, dy, draw_clip, this ); fl_scroll( X, Y, W, H, dx, dy, draw_clip, this );
} }
_old_xposition = xoffset;
_old_yposition = _yposition;
if ( damage() & FL_DAMAGE_CHILD ) if ( damage() & FL_DAMAGE_CHILD )
{ {
fl_push_clip( rulers->x(), rulers->y(), rulers->w(), rulers->h() ); fl_push_clip( rulers->x(), rulers->y(), rulers->w(), rulers->h() );
@ -598,20 +596,30 @@ Timeline::draw ( void )
update_child( *vscroll ); update_child( *vscroll );
} }
done:
_old_xposition = xoffset;
_old_yposition = _yposition;
} }
void void
Timeline::draw_cursor ( nframes_t frame, Fl_Color color ) Timeline::draw_cursor ( nframes_t frame, Fl_Color color )
{ {
int x = ( ts_to_x( frame ) - ts_to_x( xoffset ) ) + tracks->x() + Track::width(); // int x = ( ts_to_x( frame ) - ts_to_x( xoffset ) ) + tracks->x() + Track::width();
if ( x < tracks->x() + Track::width() || x > tracks->x() + tracks->w() ) if ( frame < xoffset )
return;
const int x = ts_to_x( frame - xoffset ) + tracks->x() + Track::width();
if ( x > tracks->x() + tracks->w() )
return; return;
fl_color( color ); fl_color( color );
int y = rulers->y() + rulers->h(); const int y = rulers->y() + rulers->h();
int h = this->h() - hscroll->h(); const int h = this->h() - hscroll->h();
fl_push_clip( Track::width(), y, tracks->w(), h ); fl_push_clip( Track::width(), y, tracks->w(), h );