From acc1283e31b61948184d6340a84a4a53124686d6 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Sun, 27 Apr 2008 02:18:03 -0500 Subject: [PATCH] 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. --- Timeline/Timeline.C | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/Timeline/Timeline.C b/Timeline/Timeline.C index 82fc5b2..0c31c21 100644 --- a/Timeline/Timeline.C +++ b/Timeline/Timeline.C @@ -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