kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Fixed display of a routing mark text.

Browse source
This commit is contained in:
Daria Volvenkova 2017-12-08 18:51:42 +03:00 • committed by Ilya Grechuhin
parent b27a62f7e7
commit c13d79f2bb
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drape_frontend/user_mark_shapes.cpp
View file

@ -239,19 +239,20 @@ void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture
params.m_depthLayer = renderInfo.m_depthLayer;
params.m_minVisibleScale = renderInfo.m_minZoom;
uint32_t overlayIndex = 0;
uint32_t const overlayIndex = kStartUserMarkOverlayIndex + renderInfo.m_index;
if (renderInfo.m_hasTitlePriority)
{
params.m_specialDisplacement = SpecialDisplacement::UserMark;
params.m_specialPriority = renderInfo.m_priority;
overlayIndex = kStartUserMarkOverlayIndex + renderInfo.m_index;
params.m_startOverlayRank = dp::OverlayRank0;
if (renderInfo.m_symbolNames != nullptr)
params.m_startOverlayRank++;
if (renderInfo.m_coloredSymbols != nullptr)
params.m_startOverlayRank++;
ASSERT_LESS(params.m_startOverlayRank, dp::OverlayRanksCount, ());
if (renderInfo.m_hasSymbolPriority)
{
if (renderInfo.m_symbolNames != nullptr)
params.m_startOverlayRank++;
if (renderInfo.m_coloredSymbols != nullptr)
params.m_startOverlayRank++;
ASSERT_LESS(params.m_startOverlayRank, dp::OverlayRanksCount, ());
}
}
if (renderInfo.m_symbolSizes != nullptr)

3
map/routing_mark.cpp
View file

@ -91,7 +91,10 @@ void RouteMarkPoint::SetMarkData(RouteMarkData && data)
m_markData = std::move(data);
m_titleDecl.m_primaryText = m_markData.m_title;
if (!m_titleDecl.m_primaryText.empty())
{
m_titleDecl.m_secondaryText = m_markData.m_subTitle;
m_titleDecl.m_secondaryOptional = true;
}
else
m_titleDecl.m_secondaryText.clear();
}