diff options
author | rachytski <siarhei.rachytski@gmail.com> | 2012-08-14 14:29:10 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:42:04 +0300 |
commit | e95659641b14b01e5104332815f6ab6bc8207391 (patch) | |
tree | ca730b590a3e89966259274fdfe0fb8aa22ee4ed /map/navigator.hpp | |
parent | 736defcc69ce4d4853c396fe0a412b216c1d2dfa (diff) |
checking for rotation threshold while scaling by two fingers.
Diffstat (limited to 'map/navigator.hpp')
-rw-r--r-- | map/navigator.hpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/map/navigator.hpp b/map/navigator.hpp index b232797d54..15f6cc0006 100644 --- a/map/navigator.hpp +++ b/map/navigator.hpp @@ -103,7 +103,16 @@ private: // Flag, which indicates, whether we are in the middle of some action. bool m_InAction; // Does Navigator supports screen rotation. - bool m_doSupportRotation; + bool m_DoSupportRotation; + // Should we check for threshold while scaling by two fingers. + bool m_DoCheckRotationThreshold; + // Do screen rotates during the two fingers scaling. + bool m_IsRotatingDuringScale; // Used in DoScale and ScaleByPoint - bool ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2, m2::PointD const & oldPt1, m2::PointD const & oldPt2, bool skipMaxScaleAndBordersCheck); + bool ScaleImpl(m2::PointD const & newPt1, + m2::PointD const & newPt2, + m2::PointD const & oldPt1, + m2::PointD const & oldPt2, + bool skipMaxScaleAndBordersCheck, + bool doRotateScreen); }; |