Mercurial > hg > svcore

diff base/ZoomConstraint.h @ 1564:5f9c9d8c3de6 zoom

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Tue, 06 Nov 2018 08:58:57 +0000
parents 05c3fbaec8ea
children
line wrap: on
line diff
--- a/base/ZoomConstraint.h	Fri Oct 05 10:25:25 2018 +0100
+++ b/base/ZoomConstraint.h	Tue Nov 06 08:58:57 2018 +0000
@@ -54,6 +54,10 @@
                                           RoundingDirection = RoundNearest)
         const
     {
+        // canonicalise
+        if (requestedZoomLevel.level == 1) {
+            requestedZoomLevel.zone = ZoomLevel::FramesPerPixel;
+        }
         if (getMaxZoomLevel() < requestedZoomLevel) return getMaxZoomLevel();
 	else return requestedZoomLevel;
     }