diff --git a/map/information_display.cpp b/map/information_display.cpp index 3bdcccebd8..056da5d9e9 100644 --- a/map/information_display.cpp +++ b/map/information_display.cpp @@ -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); diff --git a/map/ruler.cpp b/map/ruler.cpp index b9fe5e136c..5703d0ec95 100644 --- a/map/ruler.cpp +++ b/map/ruler.cpp @@ -290,7 +290,7 @@ void Ruler::draw(yg::gl::OverlayRenderer * s, math::Matrix 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, diff --git a/yg/path_text_element.cpp b/yg/path_text_element.cpp index 5123ebe2cd..41dc0ac2f9 100644 --- a/yg/path_text_element.cpp +++ b/yg/path_text_element.cpp @@ -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) diff --git a/yg/straight_text_element.cpp b/yg/straight_text_element.cpp index e9d7f31a4d..1c0e842635 100644 --- a/yg/straight_text_element.cpp +++ b/yg/straight_text_element.cpp @@ -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); } } diff --git a/yg/symbol_element.cpp b/yg/symbol_element.cpp index be12209a08..078052a979 100644 --- a/yg/symbol_element.cpp +++ b/yg/symbol_element.cpp @@ -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