pv::view::View::zoom_fit: clamp the scale between MaxScale and MinScale

[pulseview.git] / pv / view / view.cpp

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 35195b58dc150c8743f5d623e7495ccb1ecd5412..b0e97cb8e04e7df2d5ae558fe92ddcac0ed6c7f7 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -154,9 +154,7 @@ void View::zoom(double steps)
 
 void View::zoom(double steps, int offset)
 {
-       const double new_scale = max(min(_scale * pow(3.0/2.0, -steps),
-               MaxScale), MinScale);
-       set_zoom(new_scale, offset);
+       set_zoom(_scale * pow(3.0/2.0, -steps), offset);
 }
 
 void View::zoom_fit()
@@ -171,7 +169,8 @@ void View::zoom_fit()
        if (w <= 0)
                return;
 
-       set_scale_offset(delta / w, extents.first);
+       const double scale = max(min(delta / w, MaxScale), MinScale);
+       set_scale_offset(scale, extents.first);
 }
 
 void View::zoom_one_to_one()