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

Review fixes.

Browse source
This commit is contained in:
Daria Volvenkova 2016-03-29 15:27:22 +03:00
parent 897cd1f9be
commit ece04d4d43
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drape_frontend/drape_engine.cpp
View file

@ -30,14 +30,17 @@ DrapeEngine::DrapeEngine(Params && params)
location::EMyPositionMode mode = params.m_initialMyPositionMode.first;
if (!params.m_initialMyPositionMode.second && !settings::Get(settings::kLocationStateMode, mode))
{
mode = location::MODE_UNKNOWN_POSITION;
// If the screen rect setting in follow and rotate mode is missing or invalid, it could cause invalid animations,
// so the follow and rotate mode should be discarded.
m2::AnyRectD rect;
if (mode == location::MODE_ROTATE_AND_FOLLOW &&
!(settings::Get("ScreenClipRect", rect) && df::GetWorldRect().IsRectInside(rect.GetGlobalRect())))
mode = location::MODE_FOLLOW;
}
else if (mode == location::MODE_ROTATE_AND_FOLLOW)
{
// If the screen rect setting in follow and rotate mode is missing or invalid, it could cause invalid animations,
// so the follow and rotate mode should be discarded.
m2::AnyRectD rect;
if (!(settings::Get("ScreenClipRect", rect) && df::GetWorldRect().IsRectInside(rect.GetGlobalRect())))
mode = location::MODE_FOLLOW;
}
FrontendRenderer::Params frParams(make_ref(m_threadCommutator), params.m_factory,
make_ref(m_textureManager), m_viewport,