From 9392cd62d75a2283f20b1ef8f447954abb1f65a5 Mon Sep 17 00:00:00 2001 From: rachytski Date: Mon, 19 Sep 2011 02:38:03 +0300 Subject: [PATCH] [iOS] Build Fixes. --- map/information_display.cpp | 7 ++++--- yg/symbol_element.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/map/information_display.cpp b/map/information_display.cpp index b012a3a48c..afd586e494 100644 --- a/map/information_display.cpp +++ b/map/information_display.cpp @@ -356,7 +356,8 @@ void InformationDisplay::drawEmptyModelMessage(DrawerYG * pDrawer) yg::StraightTextElement ste0(params); - math::Matrix m = math::Shift(math::Identity(), m2::PointD(0, -ste0.boundRect().GetGlobalRect().SizeY() - 5)); + math::Matrix m = math::Shift(math::Identity(), + m2::PointD(0, -ste0.roughBoundRect().SizeY() - 5)); ste0.draw(pDrawer->screen().get(), m); params.m_pivot = pt; @@ -365,13 +366,13 @@ void InformationDisplay::drawEmptyModelMessage(DrawerYG * pDrawer) ste1.draw(pDrawer->screen().get(), math::Identity()); - params.m_pivot.y += ste1.boundRect().GetGlobalRect().SizeY() + 5; + params.m_pivot.y += ste1.roughBoundRect().SizeY() + 5; params.m_logText = strings::MakeUniString(s2); yg::StraightTextElement ste2(params); ste2.draw(pDrawer->screen().get(), math::Identity()); - params.m_pivot.y += ste2.boundRect().GetGlobalRect().SizeY() + 5; + params.m_pivot.y += ste2.roughBoundRect().SizeY() + 5; params.m_logText = strings::MakeUniString(s3); yg::StraightTextElement ste3(params); diff --git a/yg/symbol_element.cpp b/yg/symbol_element.cpp index 07be8568e6..475a347e73 100644 --- a/yg/symbol_element.cpp +++ b/yg/symbol_element.cpp @@ -79,7 +79,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(), - depth(), + yg::maxDepth, m_style->m_pipelineID); }