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

[ios][bookmarks] Bookmark pins are now displayed on top of all other texts on the map

Browse source
This commit is contained in:
Alex Zolotarev 2013-01-11 17:52:42 +03:00 • committed by Alex Zolotarev
parent 08690761ad
commit f852dc207c
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
graphics/path_text_element.cpp
View file

@ -57,10 +57,10 @@ namespace graphics
if (isNeedRedraw())
c = graphics::Color(255, 0, 0, 64);
screen->drawRectangle(roughBoundRect(), graphics::Color(255, 255, 0, 64), graphics::maxDepth - 3);
screen->drawRectangle(roughBoundRect(), graphics::Color(255, 255, 0, 64), graphics::maxDepth - 10);
for (unsigned i = 0; i < boundRects().size(); ++i)
screen->drawRectangle(boundRects()[i], c, graphics::maxDepth - 3);
screen->drawRectangle(boundRects()[i], c, graphics::maxDepth - 10);
}
if (!isNeedRedraw() || !isVisible() || !isValid())
@ -70,11 +70,11 @@ namespace graphics
if (desc.m_isMasked)
{
drawTextImpl(m_glyphLayout, screen, m, false, false, desc, graphics::maxDepth - 2);
drawTextImpl(m_glyphLayout, screen, m, false, false, desc, graphics::maxDepth - 9);
desc.m_isMasked = false;
}
drawTextImpl(m_glyphLayout, screen, m, false, false, desc, graphics::maxDepth - 1);
drawTextImpl(m_glyphLayout, screen, m, false, false, desc, graphics::maxDepth - 8);
}
void PathTextElement::setPivot(m2::PointD const & pivot)

8
graphics/straight_text_element.cpp
View file

@ -259,10 +259,10 @@ namespace graphics
if (isNeedRedraw())
c = graphics::Color(255, 0, 0, 64);
screen->drawRectangle(roughBoundRect(), graphics::Color(255, 255, 0, 64), graphics::maxDepth - 3);
screen->drawRectangle(roughBoundRect(), graphics::Color(255, 255, 0, 64), graphics::maxDepth - 10);
for (unsigned i = 0 ; i < boundRects().size(); ++i)
screen->drawRectangle(boundRects()[i], c, graphics::maxDepth - 3);
screen->drawRectangle(boundRects()[i], c, graphics::maxDepth - 10);
}
if (!isNeedRedraw())
@ -271,14 +271,14 @@ namespace graphics
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
{
if (m_glyphLayouts[i].fontDesc().m_isMasked)
drawTextImpl(m_glyphLayouts[i], screen, m, true, true, m_glyphLayouts[i].fontDesc(), graphics::maxDepth - 2);
drawTextImpl(m_glyphLayouts[i], screen, m, true, true, m_glyphLayouts[i].fontDesc(), graphics::maxDepth - 9);
}
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
{
graphics::FontDesc fontDesc = m_glyphLayouts[i].fontDesc();
fontDesc.m_isMasked = false;
drawTextImpl(m_glyphLayouts[i], screen, m, true, true, fontDesc, graphics::maxDepth - 1);
drawTextImpl(m_glyphLayouts[i], screen, m, true, true, fontDesc, graphics::maxDepth - 8);
}
}