diff options
| author | rachytski <siarhei.rachytski@gmail.com> | 2011-04-05 01:46:34 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:15:08 +0300 |
| commit | 8bf41c7d837e828a43c74e14fff06ba471bb65bb (patch) | |
| tree | b95b28b6b630fdcdacd05ecf4bfbb6f607232451 /map/navigator.hpp | |
| parent | 1c198ebdfce7ad44914593c07ee204ec34323478 (diff) | |
better ScaleImpl implementation to allow scaling on world borders.
Diffstat (limited to 'map/navigator.hpp')
| -rw-r--r-- | map/navigator.hpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/map/navigator.hpp b/map/navigator.hpp index cd7c06727d..3ed1b168ac 100644 --- a/map/navigator.hpp +++ b/map/navigator.hpp @@ -69,8 +69,11 @@ private: bool CheckMaxScale(ScreenBase const & screen); bool CheckBorders(ScreenBase const & screen); - // adjusting screen to specified limits - ScreenBase const AdjustToBounds(ScreenBase const & screen, m2::RectD const & boundRect, bool doScaleOnly); + bool CanShrinkInto(ScreenBase const & screen, m2::RectD const & boundRect); + ScreenBase const ShrinkInto(ScreenBase const & screen, m2::RectD const & boundRect); + ScreenBase const ScaleInto(ScreenBase const & screen, m2::RectD const & boundRect); + ScreenBase const ShrinkAndScaleInto(ScreenBase const & screen, m2::RectD const & boundRect); + // Internal screen corresponding to the state when navigation began with StartDrag or StartScale. ScreenBase m_StartScreen; // Internal screen to do GtoP() and PtoG() calculations. It is always up to date with navigation. |