diff options
| author | ExMix <rahuba.youri@mapswithme.com> | 2014-03-21 12:54:55 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:13:47 +0300 |
| commit | 9fbee7a87682189861a0f06f031eb49432ed17df (patch) | |
| tree | 1aa6ab72ad458e074b6ad276eb1911bf17f79f17 /map/ruler.cpp | |
| parent | 5ecf5d77656226311ff403107d8a9d8a6b945793 (diff) | |
revert ruler color.
add spaces in ruler mark
Diffstat (limited to 'map/ruler.cpp')
| -rw-r--r-- | map/ruler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/map/ruler.cpp b/map/ruler.cpp index aeb2302e5b..cece61d3c9 100644 --- a/map/ruler.cpp +++ b/map/ruler.cpp @@ -173,7 +173,7 @@ void Ruler::RulerFrame::Cache(const string & text, graphics::FontDesc const & f) // double glyphHalfH = glyphRect.SizeY() / 2.0; // double zeroMarkOffset = (glyphHalfH + 2) + 5 * k; - graphics::Brush::Info brushInfo(graphics::Color(3, 3, 3, 255)); + graphics::Brush::Info brushInfo(graphics::Color(0, 0, 0, 0x99)); uint32_t brushId = cs->mapInfo(brushInfo); graphics::Resource const * brushRes = cs->fromID(brushId); m2::RectU brushRect = brushRes->m_texRect; @@ -333,7 +333,7 @@ void Ruler::RulerFrame::Cache(const string & text, graphics::FontDesc const & f) resourceRect.Inflate(-1, -1); double w = resourceRect.SizeX(); double h = resourceRect.SizeY(); - lengthFromStart += w; + lengthFromStart += infos[i].m_metrics.m_xAdvance; normals.push_back(m2::PointF(0.0, 0.0)); normals.push_back(m2::PointF(0.0, -h)); |