From 3fbf9f9f829500890cd86d266d5794a89d0fdad2 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Thu, 6 Mar 2008 17:29:28 -0600
Subject: [PATCH] More cleanups.

---
 Timeline.C     | 24 ++++++++++++++++--------
 Timeline.H     |  5 +++--
 Track_Widget.C |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Timeline.C b/Timeline.C
index 3a86c70..e32f334 100644
--- a/Timeline.C
+++ b/Timeline.C
@@ -40,11 +40,9 @@ Timeline::cb_scroll ( Fl_Widget *w )
     {
         tracks->position( tracks->x(), (rulers->y() + rulers->h()) - vscroll->value() );
 
-        yposition = vscroll->value();
+        yposition( vscroll->value() );
 
         vscroll->value( vscroll->value(), 30, 0, min( tracks->h(),  tracks->h() - h() - rulers->h() ) );
-
-        damage( FL_DAMAGE_SCROLL );
     }
     else
     {
@@ -59,7 +57,7 @@ Timeline::cb_scroll ( Fl_Widget *w )
         }
         else
         {
-            position( hscroll->value() );
+            xposition( hscroll->value() );
         }
     }
 }
@@ -279,15 +277,25 @@ Timeline::draw_measure_lines ( int X, int Y, int W, int H, Fl_Color color )
 
 
 void
-Timeline::position ( int X )
+Timeline::xposition ( int X )
 {
-    _old_xposition = xoffset;
+//    _old_xposition = xoffset;
 
     xoffset = x_to_ts( X );
 
     damage( FL_DAMAGE_SCROLL );
 }
 
+void
+Timeline::yposition ( int Y )
+{
+//    _old_yposition = _yposition;
+
+    _yposition = Y;
+
+    damage( FL_DAMAGE_SCROLL );
+}
+
 void
 Timeline::draw_clip ( void * v, int X, int Y, int W, int H )
 {
@@ -369,7 +377,7 @@ Timeline::draw ( void )
     if ( damage() & FL_DAMAGE_SCROLL )
     {
         int dx = ts_to_x( _old_xposition ) - ts_to_x( xoffset );
-        int dy = _old_yposition - yposition;
+        int dy = _old_yposition - _yposition;
 
         if ( ! dy )
             fl_scroll( X + Track_Header::width(), rulers->y(), rulers->w() - Fl::box_dw( rulers->child(0)->box() ), rulers->h(), dx, 0, draw_clip, this );
@@ -383,7 +391,7 @@ Timeline::draw ( void )
             fl_scroll( X, Y, W, H, dx, dy, draw_clip, this );
 
         _old_xposition = xoffset;
-        _old_yposition = yposition;
+        _old_yposition = _yposition;
 
     }
 }
diff --git a/Timeline.H b/Timeline.H
index 954ed6c..2fe0293 100644
--- a/Timeline.H
+++ b/Timeline.H
@@ -101,7 +101,7 @@ public:
 
     nframes_t xoffset;
 
-    int yposition;
+    int _yposition;
 
     Timeline ( int X, int Y, int W, int H, const char *L=0 );
 
@@ -117,7 +117,8 @@ public:
     int nearest_line ( int ix );
 
     void draw_measure_lines ( int X, int Y, int W, int H, Fl_Color color );
-    void position ( int X );
+    void xposition ( int X );
+    void yposition ( int Y );
     void draw ( void );
     void draw_overlay ( void );
     int handle ( int m );
diff --git a/Track_Widget.C b/Track_Widget.C
index 9c99995..8434ab1 100644
--- a/Track_Widget.C
+++ b/Track_Widget.C
@@ -214,7 +214,7 @@ Track_Widget::handle ( int m )
                 else
                     pos += d;
 
-                timeline->position( timeline->ts_to_x(  pos ) );
+                timeline->xposition( timeline->ts_to_x(  pos ) );
                 _track->redraw();
             }