X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=b0e97cb8e04e7df2d5ae558fe92ddcac0ed6c7f7;hp=35195b58dc150c8743f5d623e7495ccb1ecd5412;hb=e183f4e328db8bb134652254ba9bf0707dc16c66;hpb=a472a884a9d2d17eb31a8a02322608fe7d71e8a3

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 35195b58..b0e97cb8 100644
--- 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()