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

fixed appearance and colors of ruler and center label.

Browse source
This commit is contained in:
rachytski 2011-11-15 23:01:42 +04:00 • committed by Alex Zolotarev
parent 9b10fda81c
commit 1a79e535e2
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
map/information_display.cpp
View file

@ -89,12 +89,15 @@ void InformationDisplay::setRulerParams(unsigned pxMinWidth, double metresMinWid
void InformationDisplay::drawRuler(DrawerYG * pDrawer)
{
m_ruler.setFontDesc(m_fontDesc);
yg::FontDesc rulerFont = m_fontDesc;
rulerFont.m_color = yg::Color(0x44, 0x44, 0x44, 0xFF);
m_ruler.setFontDesc(rulerFont);
m_ruler.setVisualScale(m_visualScale);
#ifdef OMIM_OS_IPHONE
m2::PointD pivot(m2::PointD(m_displayRect.maxX(),
m_displayRect.maxY() - 30 * m_visualScale)
m_displayRect.maxY() - 20 * m_visualScale)
+ m2::PointD(-10 * m_visualScale, - 10 * m_visualScale));
m_ruler.setPosition(yg::EPosAboveLeft);
#else
@ -139,13 +142,12 @@ void InformationDisplay::drawCenter(DrawerYG * drawer)
params.m_depth = yg::maxDepth;
params.m_fontDesc = m_fontDesc;
params.m_fontDesc.m_color = yg::Color(0x44, 0x44, 0x44, 0xFF);
params.m_log2vis = false;
LOG(LINFO, (m_visualScale));
#ifdef OMIM_OS_IPHONE
params.m_pivot = m2::PointD(m_displayRect.maxX() - 10 * m_visualScale,
m_displayRect.maxY() - 15 * m_visualScale);
m_displayRect.maxY() - 10 * m_visualScale);
params.m_position = yg::EPosAboveLeft;
#else
params.m_pivot = m2::PointD(m_displayRect.maxX() - 10 * m_visualScale,
@ -160,10 +162,10 @@ void InformationDisplay::drawCenter(DrawerYG * drawer)
m2::RectD bgRect = m2::Inflate(ste.roughBoundRect(), 5.0, 5.0);
drawer->screen()->drawRectangle(
bgRect,
yg::Color(187, 187, 187, 128),
yg::maxDepth - 1);
// drawer->screen()->drawRectangle(
// bgRect,
// yg::Color(187, 187, 187, 128),
// yg::maxDepth - 1);
ste.draw(drawer->screen().get(), math::Identity<double, 3>());
}

10
map/ruler.cpp
View file

@ -269,14 +269,14 @@ void Ruler::draw(yg::gl::OverlayRenderer * s, math::Matrix<double, 3, 3> const &
{
if (m_isInitialized)
{
s->drawPath(
&m_path[0], m_path.size(), 0,
s->skin()->mapPenInfo(yg::PenInfo(yg::Color(255, 255, 255, 255), 2 * m_visualScale, 0, 0, 0)),
depth() - 3);
// s->drawPath(
// &m_path[0], m_path.size(), 0,
// s->skin()->mapPenInfo(yg::PenInfo(m_fontDesc.m_color, 2 * m_visualScale, 0, 0, 0)),
// depth() - 3);
s->drawPath(
&m_path[0], m_path.size(), 0,
s->skin()->mapPenInfo(yg::PenInfo(yg::Color(0, 0, 0, 255), 1 * m_visualScale, 0, 0, 0)),
s->skin()->mapPenInfo(yg::PenInfo(yg::Color(0, 0, 0, 0x99), 1 * m_visualScale, 0, 0, 0)),
depth() - 2);
if (position() & yg::EPosLeft)