From 8831a32a9cf6da03dcc9270585f3bca6cc9275eb Mon Sep 17 00:00:00 2001
From: ExMix <rahuba.youri@mapswithme.com>
Date: Thu, 20 Mar 2014 15:17:27 +0300
Subject: [PATCH] [drape] Initialize navigator by size in constructor

---
 drape_frontend/drape_engine.cpp | 6 +-----
 drape_head/drape_surface.cpp    | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index 8501cf55f4..d42b08ef95 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -12,6 +12,7 @@ namespace df
     GLFunctions::Init();
     VisualParams::Init(vs, df::CalculateTileSize(m_viewport.GetWidth(), m_viewport.GetHeight()));
     m_navigator.LoadState();
+    m_navigator.OnSize(0, 0, m_viewport.GetWidth(), m_viewport.GetHeight());
 
     m_threadCommutator = MasterPointer<ThreadsCommutator>(new ThreadsCommutator());
     RefPointer<ThreadsCommutator> commutatorRef = m_threadCommutator.GetRefPointer();
@@ -24,7 +25,6 @@ namespace df
 
   DrapeEngine::~DrapeEngine()
   {
-    //m_modelView.Save();
     m_navigator.SaveState();
     m_backend.Destroy();
     m_frontend.Destroy();
@@ -36,7 +36,6 @@ namespace df
     if (m_viewport.GetWidth() == w && m_viewport.GetHeight() == h)
       return;
 
-    //m_modelView.Resize(w, h);
     m_viewport.SetViewport(0, 0, w, h);
     m_navigator.OnSize(0, 0, w, h);
     m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
@@ -46,21 +45,18 @@ namespace df
 
   void DrapeEngine::DragStarted(const m2::PointF & p)
   {
-    //m_modelView.DrawStarted(p);
     m_navigator.StartDrag(p, 0.0);
     UpdateCoverage();
   }
 
   void DrapeEngine::Drag(m2::PointF const & p)
   {
-    //m_modelView.Drag(p);
     m_navigator.DoDrag(p, 0.0);
     UpdateCoverage();
   }
 
   void DrapeEngine::DragEnded(m2::PointF const & p)
   {
-    //m_modelView.DragEnded(p);
     m_navigator.StopDrag(p, 0.0, false);
     UpdateCoverage();
   }
diff --git a/drape_head/drape_surface.cpp b/drape_head/drape_surface.cpp
index aa08245aee..07c88a5bb4 100644
--- a/drape_head/drape_surface.cpp
+++ b/drape_head/drape_surface.cpp
@@ -102,8 +102,6 @@ void DrapeSurface::CreateEngine()
 
   m_drapeEngine = MasterPointer<df::DrapeEngine>(
                     new df::DrapeEngine(f , pixelRatio, df::Viewport(pixelRatio, 0, 0, width(), height())));
-
-  sizeChanged(0);
 }
 
 void DrapeSurface::sizeChanged(int)