diff options
author | ExMix <rahuba.youri@mapswithme.com> | 2014-05-13 14:37:18 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:15:36 +0300 |
commit | de0900e2d0f59e64093dcb1c0a5cbb5704b7aeae (patch) | |
tree | ca0305493efb0f47aed4225454e866ee11002070 /map/navigator.hpp | |
parent | 515d0a36f9f0e7f25abbaa40a0b63c74c0ceffcb (diff) |
[core] return ruler on screen. Remove button +\- reaction of ruler
Diffstat (limited to 'map/navigator.hpp')
-rw-r--r-- | map/navigator.hpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/map/navigator.hpp b/map/navigator.hpp index b0a16b597c..d145cb4be5 100644 --- a/map/navigator.hpp +++ b/map/navigator.hpp @@ -14,8 +14,7 @@ class Navigator { public: - typedef function<void ()> invalidate_fn; - Navigator(ScalesProcessor const & scales, invalidate_fn const & invalidateFn); + Navigator(ScalesProcessor const & scales); void SetFromRect(m2::AnyRectD const & r); void CenterViewport(m2::PointD const & p); @@ -113,7 +112,6 @@ private: math::Matrix<float, 3, 3> m_DeltaMatrix; // Flag, which indicates, whether we are in the middle of some action. bool m_InAction; - bool m_InMomentScaleAction; // Does Navigator supports screen rotation. bool m_DoSupportRotation; // Should we check for threshold while scaling by two fingers. @@ -127,11 +125,4 @@ private: m2::PointD const & oldPt2, bool skipMinScaleAndBordersCheck, bool doRotateScreen); - - void ResetMomentScaleAction(); - void StartMomentScaleReseter(); - void KillMomentScaleReseter(); - - scoped_ptr<ScheduledTask> m_reseterTask; - invalidate_fn m_invalidateFn; }; |