mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

review fix

Browse source
This commit is contained in:
ExMix 2014-04-07 13:55:44 +03:00 • committed by Alex Zolotarev
parent 932855c119
commit a3fd61b629
4 changed files with 5 additions and 10 deletions

1
map/framework.cpp
View file

@ -796,7 +796,6 @@ void Framework::DrawAdditionalInfo(shared_ptr<PaintEvent> const & e)
// somewhere here I can add current place mark
m_balloonManager.DrawPin(e);
LOG(LINFO, ("Draw gui"));
m_guiController->UpdateElements();
m_guiController->DrawFrame(pScreen);
}

9
map/navigator.cpp
View file

@ -496,22 +496,19 @@ void Navigator::ResetMomentScaleAction()
{
m_InMomentScaleAction = false;
m_invalidateFn();
LOG(LINFO, ("Invalidate Call"));
}
void Navigator::StartMomentScaleReseter()
{
KillMomentScalereseter();
KillMomentScaleReseter();
m_InMomentScaleAction = true;
m_reseterTask.reset(new ScheduledTask(bind(&Navigator::ResetMomentScaleAction, this), 250));
}
void Navigator::KillMomentScalereseter()
void Navigator::KillMomentScaleReseter()
{
if (m_reseterTask == NULL)
return;
m_reseterTask->CancelBlocking();
m_reseterTask->CancelBlocking();
}
void Navigator::DoScale(m2::PointD const & pt1, m2::PointD const & pt2, double /*timeInSec*/)

4
map/navigator.hpp
View file

@ -15,7 +15,7 @@ class Navigator
{
public:
typedef function<void ()> invalidate_fn;
explicit Navigator(ScalesProcessor const & scales, invalidate_fn const & invalidateFn);
Navigator(ScalesProcessor const & scales, invalidate_fn const & invalidateFn);
void SetFromRect(m2::AnyRectD const & r);
void CenterViewport(m2::PointD const & p);
@ -130,7 +130,7 @@ private:
void ResetMomentScaleAction();
void StartMomentScaleReseter();
void KillMomentScalereseter();
void KillMomentScaleReseter();
scoped_ptr<ScheduledTask> m_reseterTask;
invalidate_fn m_invalidateFn;

1
map/ruler.cpp
View file

@ -562,7 +562,6 @@ void Ruler::AnimateShow()
void Ruler::AnimateHide()
{
LOG(LINFO, ("Animate hide"));
RulerFrame * frame = GetMainFrame();
if (isVisible() && (!frame->IsAnimActive() || !frame->IsHidingAnim()))
{