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

[drape] Initialize navigator by size in constructor

Browse source
This commit is contained in:
ExMix 2014-03-20 15:17:27 +03:00 • committed by Alex Zolotarev
parent 6a33d8a3bf
commit 8831a32a9c
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drape_frontend/drape_engine.cpp
View file

@ -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();
}

2
drape_head/drape_surface.cpp
View file

@ -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)