Mercurial > hg > svcore

comparison 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
comparison
equal deleted inserted replaced
1549:2fec0d9bd7ac 1564:5f9c9d8c3de6
52 */ 52 */
53 virtual ZoomLevel getNearestZoomLevel(ZoomLevel requestedZoomLevel, 53 virtual ZoomLevel getNearestZoomLevel(ZoomLevel requestedZoomLevel,
54 RoundingDirection = RoundNearest) 54 RoundingDirection = RoundNearest)
55 const 55 const
56 { 56 {
57 // canonicalise
58 if (requestedZoomLevel.level == 1) {
59 requestedZoomLevel.zone = ZoomLevel::FramesPerPixel;
60 }
57 if (getMaxZoomLevel() < requestedZoomLevel) return getMaxZoomLevel(); 61 if (getMaxZoomLevel() < requestedZoomLevel) return getMaxZoomLevel();
58 else return requestedZoomLevel; 62 else return requestedZoomLevel;
59 } 63 }
60 64
61 /** 65 /**