resizing increases the viewable world

When resizing increase the amount of world that's visibile in the viewport
(and a couple of { moves.

diff --git a/alg/glseqbrowser.cpp b/alg/glseqbrowser.cpp
index 0b85cb80ac5c64aba6c37448276e75cbdd441b75..7a5d683ce22132782bb63d2cbeb52f573c9acca9 100644 (file)
--- a/alg/glseqbrowser.cpp
+++ b/alg/glseqbrowser.cpp
@@ -41,7 +41,7 @@ void GlSeqBrowser::resizeGL(int width, int height)
   viewport_size.x = width;
   viewport_size.y = height;
   glViewport(0, 0, (GLsizei)width, (GLsizei)height);
-  //update_layout();
+  update_viewport(viewport_center, zoom_level);
 }
 
 void GlSeqBrowser::paintGL() const
@@ -187,8 +187,9 @@ float GlSeqBrowser::left() const
     left = track_i->x();
     for( ; track_i != track_container.end(); ++track_i)
     {
-      if (track_i->x() < left)
+      if (track_i->x() < left) {
         left = track_i->x();
+      }
     }
     return left-border_width;
   }
@@ -197,14 +198,12 @@ float GlSeqBrowser::left() const
 float GlSeqBrowser::right() const
 { 
   float right;
-  if (track_container.size() == 0)
-  {
+  if (track_container.size() == 0) {
     return cur_ortho.right;
   } else {
     vector<GlSequence>::const_iterator track_i = track_container.begin();
     right = track_i->right();
-    for( ; track_i != track_container.end(); ++track_i)
-    {
+    for( ; track_i != track_container.end(); ++track_i) {
       if (track_i->right() > right)
         right = track_i->right();
     }

diff --git a/qui/seqbrowser/ScrollableSequenceBrowser.cpp b/qui/seqbrowser/ScrollableSequenceBrowser.cpp
index 0349c873b5058fbcc0bd35ec226e36e070aee3bc..b379d4f6f07c9bbf42b7f8363e70e76b968718b8 100644 (file)
--- a/qui/seqbrowser/ScrollableSequenceBrowser.cpp
+++ b/qui/seqbrowser/ScrollableSequenceBrowser.cpp
@@ -25,15 +25,9 @@ ScrollableSequenceBrowser::ScrollableSequenceBrowser(QWidget *parent) :
 
 void ScrollableSequenceBrowser::updateScrollBar()
 {
-  float max_right = sequence_browser.right();
-  float max_left = sequence_browser.left();
-  float max_range = max_right - max_left;
-  float cur_left = sequence_browser.viewportLeft();
-  float cur_right = sequence_browser.viewportRight();
-  float cur_center = ((cur_right-cur_left)/2)+cur_left;
-  // set range to min
-  thumb = (int)cur_center;
-  viewportBar.setRange((int)max_left, (int)max_right);
+  thumb = (int)sequence_browser.viewportCenter();
+  viewportBar.setRange((int)sequence_browser.left(), 
+                       (int)sequence_browser.right());
   viewportBar.setValue(thumb);
 }