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

rendering Ruler above all other OverlayElements.

Browse source
This commit is contained in:
rachytski 2012-10-11 16:09:33 +03:00 • committed by Alex Zolotarev
parent 163e4762ca
commit 38bbac73c2
5 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
map/information_display.cpp
View file

@ -42,6 +42,8 @@ InformationDisplay::InformationDisplay(Framework * framework)
m_fontDesc.m_isMasked = true;
m_fontDesc.m_maskColor = yg::Color(0xFF, 0xFF, 0xFF, 0x80);
m_ruler.setDepth(yg::maxDepth);
CountryStatusDisplay::Params p;
p.m_pivot = m2::PointD(0, 0);

2
map/ruler.cpp
View file

@ -290,7 +290,7 @@ void Ruler::draw(yg::gl::OverlayRenderer * s, math::Matrix<double, 3, 3> const &
s->drawPath(
&m_path[0], m_path.size(), 0,
s->skin()->mapPenInfo(yg::PenInfo(yg::Color(0, 0, 0, 0x99), 2 * m_visualScale, 0, 0, 0)),
depth() - 2);
depth());
if (position() & yg::EPosLeft)
s->drawText(m_fontDesc,

4
yg/path_text_element.cpp
View file

@ -70,11 +70,11 @@ namespace yg
if (desc.m_isMasked)
{
drawTextImpl(m_glyphLayout, screen, m, false, false, desc, yg::maxDepth - 1);
drawTextImpl(m_glyphLayout, screen, m, false, false, desc, yg::maxDepth - 2);
desc.m_isMasked = false;
}
drawTextImpl(m_glyphLayout, screen, m, false, false, desc, yg::maxDepth);
drawTextImpl(m_glyphLayout, screen, m, false, false, desc, yg::maxDepth - 1);
}
void PathTextElement::setPivot(m2::PointD const & pivot)

4
yg/straight_text_element.cpp
View file

@ -271,14 +271,14 @@ namespace yg
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(), yg::maxDepth - 1);
drawTextImpl(m_glyphLayouts[i], screen, m, true, true, m_glyphLayouts[i].fontDesc(), yg::maxDepth - 2);
}
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
{
yg::FontDesc fontDesc = m_glyphLayouts[i].fontDesc();
fontDesc.m_isMasked = false;
drawTextImpl(m_glyphLayouts[i], screen, m, true, true, fontDesc, yg::maxDepth);
drawTextImpl(m_glyphLayouts[i], screen, m, true, true, fontDesc, yg::maxDepth - 1);
}
}

4
yg/symbol_element.cpp
View file

@ -85,7 +85,7 @@ namespace yg
r->drawStraightTexturedPolygon(pivot(),
texRect.minX(), texRect.minY(), texRect.maxX(), texRect.maxY(),
posPt.x, posPt.y, posPt.x + texRect.SizeX(), posPt.y + texRect.SizeY(),
yg::maxDepth,
yg::maxDepth - 2,
style->m_pipelineID);
#else
@ -93,7 +93,7 @@ namespace yg
r->drawTexturedPolygon(m2::PointD(0.0, 0.0), 0.0,
texRect.minX(), texRect.minY(), texRect.maxX(), texRect.maxY(),
posPt.x, posPt.y, posPt.x + texRect.SizeX(), posPt.y + texRect.SizeY(),
yg::maxDepth,
yg::maxDepth - 2,
style->m_pipelineID);
#endif