Browse Source

Fix exectution order in timeline redraw.

This fixes the issue where scrolling with the mouse wheel while
the cursor was over a sequence widget would cause the widget
to a appear to jump.
tags/non-daw-v1.1.0
Jonathan Moore Liles 17 years ago
parent
commit
acc1283e31
1 changed files with 14 additions and 15 deletions
  1. +14
    -15
      Timeline/Timeline.C

+ 14
- 15
Timeline/Timeline.C View File

@@ -510,21 +510,6 @@ Timeline::draw ( void )
return;
}

if ( damage() & FL_DAMAGE_CHILD )
{
fl_push_clip( rulers->x(), rulers->y(), rulers->w(), rulers->h() );
update_child( *rulers );
fl_pop_clip();

fl_push_clip( tracks->x(), rulers->y() + rulers->h(), tracks->w(), hscroll->y() - (rulers->y() + rulers->h()) );
update_child( *tracks );
fl_pop_clip();

update_child( *hscroll );
update_child( *vscroll );
}


if ( damage() & FL_DAMAGE_SCROLL )
{
int dx = ts_to_x( _old_xposition ) - ts_to_x( xoffset );
@@ -546,6 +531,20 @@ Timeline::draw ( void )

}

if ( damage() & FL_DAMAGE_CHILD )
{
fl_push_clip( rulers->x(), rulers->y(), rulers->w(), rulers->h() );
update_child( *rulers );
fl_pop_clip();

fl_push_clip( tracks->x(), rulers->y() + rulers->h(), tracks->w(), hscroll->y() - (rulers->y() + rulers->h()) );
update_child( *tracks );
fl_pop_clip();

update_child( *hscroll );
update_child( *vscroll );
}

}

void


Loading…
Cancel
Save