[Traverso-commit] traverso/src/traverso/songcanvas SongView.cpp S...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/11/29 10:04:52

Modified files:
        src/traverso/songcanvas: SongView.cpp SongView.h 

Log message:
        * scroll_up/down() use mean track height

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.h?cvsroot=traverso&r1=1.37&r2=1.38

Patches:
Index: SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- SongView.cpp        27 Nov 2007 20:56:00 -0000      1.92
+++ SongView.cpp        29 Nov 2007 10:04:52 -0000      1.93
@@ -483,13 +483,9 @@
        int yscale;
        
        if (m_trackViews.size()) {
-               int total =0;
-               foreach(TrackView* view, m_trackViews) {
-                       total += view->get_height();
-               }
-               yscale = total / (10 * m_trackViews.size());
+               yscale = int(mean_track_height() / 10);
        } else {
-               yscale = m_clipsViewPort->viewport()->height() / 10;
+               yscale = int(m_clipsViewPort->viewport()->height() / 10);
        }
        
        if (direction > 0) {
@@ -503,6 +499,19 @@
        }
 }
 
+int SongView::mean_track_height()
+{
+       int total =0;
+       int mean = 0;
+       
+       foreach(TrackView* view, m_trackViews) {
+               total += view->get_height();
+       }
+       
+       mean = total / m_trackViews.size();
+       
+       return mean;
+}
 
 void SongView::update_shuttle()
 {
@@ -593,13 +602,13 @@
 
 Command* SongView::scroll_up( )
 {
-       set_vscrollbar_value(m_clipsViewPort->verticalScrollBar()->value() - 
50);
+       set_vscrollbar_value(m_clipsViewPort->verticalScrollBar()->value() - 
mean_track_height());
        return 0;
 }
 
 Command* SongView::scroll_down( )
 {
-       set_vscrollbar_value(m_clipsViewPort->verticalScrollBar()->value() + 
50);
+       set_vscrollbar_value(m_clipsViewPort->verticalScrollBar()->value() + 
mean_track_height());
        return 0;
 }
 

Index: SongView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- SongView.h  24 Sep 2007 16:58:40 -0000      1.37
+++ SongView.h  29 Nov 2007 10:04:52 -0000      1.38
@@ -119,6 +119,8 @@
        void set_hscrollbar_value(int value);
        void set_vscrollbar_value(int value);
        
+       int mean_track_height();
+       
        friend class PlayHead;