Mercurial > hg > svcore
diff base/ZoomConstraint.h @ 1527:710e6250a401 zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 17 Sep 2018 13:51:14 +0100 |
parents | d4a28d1479a8 48e9f538e6e9 |
children | c1c45c5146bb |
line wrap: on
line diff
--- a/base/ZoomConstraint.h Mon Dec 12 15:18:52 2016 +0000 +++ b/base/ZoomConstraint.h Mon Sep 17 13:51:14 2018 +0100 @@ -35,9 +35,9 @@ virtual ~ZoomConstraint() { } enum RoundingDirection { - RoundDown, - RoundUp, - RoundNearest + RoundDown, + RoundUp, + RoundNearest }; /** @@ -52,7 +52,7 @@ */ virtual ZoomLevel getNearestZoomLevel(ZoomLevel requestedZoomLevel, RoundingDirection = RoundNearest) - const + const { if (getMaxZoomLevel() < requestedZoomLevel) return getMaxZoomLevel(); else return requestedZoomLevel;