From d9c867e0c64a86e23b40f33bc839eac33d26b6b9 Mon Sep 17 00:00:00 2001
From: Yury Melnichek <melnichek@gmail.com>
Date: Sun, 14 Oct 2012 15:03:19 +0200
Subject: [PATCH] Change ruler and coordinates style.

---
 map/information_display.cpp |  6 ++----
 map/ruler.cpp               | 22 ++++++----------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/map/information_display.cpp b/map/information_display.cpp
index 056da5d9e9..6d31799ad4 100644
--- a/map/information_display.cpp
+++ b/map/information_display.cpp
@@ -39,8 +39,6 @@ InformationDisplay::InformationDisplay(Framework * framework)
     m_visualScale(1)
 {
   m_fontDesc.m_color = yg::Color(0x44, 0x44, 0x44, 0xFF);
-  m_fontDesc.m_isMasked = true;
-  m_fontDesc.m_maskColor = yg::Color(0xFF, 0xFF, 0xFF, 0x80);
 
   m_ruler.setDepth(yg::maxDepth);
 
@@ -174,7 +172,7 @@ void InformationDisplay::drawRuler(DrawerYG * pDrawer)
   m_ruler.setVisualScale(m_visualScale);
 
   m2::PointD pivot(m2::PointD(m_displayRect.maxX() - 5 * m_visualScale,
-                              m_displayRect.maxY() - 5 * m_visualScale));
+                              m_displayRect.maxY() - 4 * m_visualScale));
   m_ruler.setPosition(yg::EPosAboveLeft);
   m_ruler.setPivot(pivot);
   m_ruler.update();
@@ -217,7 +215,7 @@ void InformationDisplay::drawCenter(DrawerYG * drawer)
   params.m_log2vis = false;
 
   params.m_pivot = m2::PointD(m_displayRect.maxX() - 4 * m_visualScale,
-                              m_displayRect.maxY() - 29 * m_visualScale);
+                              m_displayRect.maxY() - 30 * m_visualScale);
   params.m_position = yg::EPosUnderLeft;
 
   params.m_glyphCache = drawer->screen()->glyphCache();
diff --git a/map/ruler.cpp b/map/ruler.cpp
index 5703d0ec95..b8c80017ed 100644
--- a/map/ruler.cpp
+++ b/map/ruler.cpp
@@ -256,17 +256,11 @@ void Ruler::update()
       scalerOrg.y += rulerHeight / 2;
 
     m_path.clear();
-    m_path.push_back(scalerOrg + m2::PointD(0, rulerHeight));
     m_path.push_back(scalerOrg);
     m_path.push_back(scalerOrg + m2::PointD(scalerWidthInPx, 0));
-    m_path.push_back(m_path[2] + m2::PointD(0, rulerHeight));
 
     /// calculating bound rect
-
-    m_boundRect = m2::RectD(m_path[0], m_path[0]);
-    m_boundRect.Add(m_path[1]);
-    m_boundRect.Add(m_path[2]);
-    m_boundRect.Add(m_path[3]);
+    m_boundRect = m2::RectD(m_path[0], m_path[1]);
   }
   else
     m_hasPendingUpdate = true;
@@ -282,19 +276,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(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, 0x99), 2 * m_visualScale, 0, 0, 0)),
+          s->skin()->mapPenInfo(yg::PenInfo(yg::Color(0, 0, 0, 0x99), 4 * m_visualScale, 0, 0, 0)),
         depth());
 
     if (position() & yg::EPosLeft)
       s->drawText(m_fontDesc,
-                  m_path[2] + m2::PointD(1 * m_visualScale, -1 * m_visualScale),
+                  m_path[1] + m2::PointD(1 * m_visualScale, -2 * m_visualScale),
                   yg::EPosAboveLeft,
                   m_scalerText,
                   depth(),
@@ -302,14 +291,15 @@ void Ruler::draw(yg::gl::OverlayRenderer * s, math::Matrix<double, 3, 3> const &
     else
       if (position() & yg::EPosRight)
         s->drawText(m_fontDesc,
-                    m_path[1] + m2::PointD(7 * m_visualScale, -3 * m_visualScale),
+                    m_path[0] + m2::PointD(7 * m_visualScale, -4 * m_visualScale),
                     yg::EPosAboveRight,
                     m_scalerText,
                     depth(),
                     false);
       else
         s->drawText(m_fontDesc,
-                    (m_path[1] + m_path[2]) * 0.5 + m2::PointD(0, -3),
+                    (m_path[0] + m_path[1]) * 0.5
+                    + m2::PointD(7 * m_visualScale, -4 * m_visualScale),
                     yg::EPosAbove,
                     m_scalerText,
                     depth(),