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

saving ShowRectFixed call when there are no renderPolicy to later execute it.

Browse source
This commit is contained in:
rachytski 2012-06-27 19:15:06 -07:00 • committed by Alex Zolotarev
parent 800685af3f
commit 0fcc98f995
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
map/framework.cpp
View file

@ -144,6 +144,7 @@ Framework::Framework()
m_doForceUpdate(false),
m_queryMaxScaleMode(false),
m_drawPlacemark(false),
m_hasPendingShowRectFixed(false),
m_metresMinWidth(10),
m_metresMaxWidth(1000000),
#if defined(OMIM_OS_MAC) || defined(OMIM_OS_WINDOWS) || defined(OMIM_OS_LINUX)
@ -601,7 +602,12 @@ void Framework::ShowRectFixed(m2::RectD rect)
{
CheckMinGlobalRect(rect);
CHECK(m_renderPolicy, ("should have renderPolicy here"));
if (!m_renderPolicy)
{
m_pendingFixedRect = rect;
m_hasPendingShowRectFixed = true;
return;
}
size_t const sz = m_renderPolicy->ScaleEtalonSize();
m2::RectD etalonRect(0, 0, sz, sz);
@ -913,10 +919,7 @@ void Framework::ShowSearchResult(search::Result const & res)
}
/// @todo We can't call this fucntion in android because of invalid m_renderPolicy.
if (m_renderPolicy)
ShowRectFixed(r);
else
ShowRect(r);
ShowRectFixed(r);
DrawPlacemark(res.GetFeatureCenter());
}
@ -962,6 +965,12 @@ void Framework::SetRenderPolicy(RenderPolicy * renderPolicy)
m_renderPolicy->GetWindowHandle()->invalidate();
m_hasPendingInvalidate = false;
}
if (m_hasPendingShowRectFixed)
{
ShowRectFixed(m_pendingFixedRect);
m_hasPendingShowRectFixed = false;
}
}
}

3
map/framework.hpp
View file

@ -73,8 +73,9 @@ protected:
vector<BookmarkCategory *> m_bookmarks;
scoped_ptr<RenderPolicy> m_renderPolicy;
bool m_hasPendingInvalidate, m_doForceUpdate, m_queryMaxScaleMode, m_drawPlacemark;
bool m_hasPendingInvalidate, m_doForceUpdate, m_queryMaxScaleMode, m_drawPlacemark, m_hasPendingShowRectFixed;
m2::RectD m_pendingFixedRect;
m2::AnyRectD m_invalidRect;
m2::PointD m_placemark;