diff --git a/drape_frontend/path_text_shape.cpp b/drape_frontend/path_text_shape.cpp index 91eb3229c9..cbd06a7b07 100644 --- a/drape_frontend/path_text_shape.cpp +++ b/drape_frontend/path_text_shape.cpp @@ -70,13 +70,13 @@ PathTextShape::PathTextShape(vector const & path, PathTextViewParams con void PathTextShape::Draw(dp::RefPointer batcher, dp::RefPointer textures) const { - strings::UniString const text = strings::MakeUniString(m_params.m_Text); - float const fontSize = m_params.m_TextFont.m_size; + strings::UniString const text = strings::MakeUniString(m_params.m_text); + float const fontSize = m_params.m_textFont.m_size; // Fill buffers int const cnt = text.size(); vector buffers(1); - float const needOutline = m_params.m_TextFont.m_needOutline; + float const needOutline = m_params.m_textFont.m_needOutline; int textureSet; for (int i = 0; i < cnt; i++) @@ -117,8 +117,8 @@ void PathTextShape::Draw(dp::RefPointer batcher, dp::RefPointer= m_params.m_OffsetEnd * m_scaleFactor || itr.BeginAgain()) + if(entireLength >= m_params.m_offsetEnd * m_scaleFactor || itr.BeginAgain()) return; PointF const pos = itr.m_pos; @@ -255,7 +255,7 @@ void PathTextHandle::Update(ScreenBase const & screen) dir *= halfWidth * m_scaleFactor; norm *= halfHeight * m_scaleFactor; - float const fontSize = m_params.m_TextFont.m_size * m_scaleFactor / 2.0f; + float const fontSize = m_params.m_textFont.m_size * m_scaleFactor / 2.0f; PointF const pivot = dir * xOffset / halfWidth + norm * yOffset / halfHeight + pos + norm2 * fontSize; PointF const p1 = pivot + dir - norm; diff --git a/drape_frontend/shape_view_params.hpp b/drape_frontend/shape_view_params.hpp index a3f2d495b3..11cb2e0ade 100644 --- a/drape_frontend/shape_view_params.hpp +++ b/drape_frontend/shape_view_params.hpp @@ -68,10 +68,10 @@ struct TextViewParams : CommonViewParams struct PathTextViewParams : CommonViewParams { FeatureID m_featureID; - FontDecl m_TextFont; - string m_Text; - float m_OffsetStart; - float m_OffsetEnd; + FontDecl m_textFont; + string m_text; + float m_offsetStart; + float m_offsetEnd; }; struct PathSymbolViewParams : CommonViewParams diff --git a/drape_head/testing_engine.cpp b/drape_head/testing_engine.cpp index 2413e9e187..2af58ac74b 100644 --- a/drape_head/testing_engine.cpp +++ b/drape_head/testing_engine.cpp @@ -406,10 +406,10 @@ void TestingEngine::DrawImpl() PathTextViewParams params3; params3.m_featureID = FeatureID(23, 78); params3.m_depth = -10.0f; - params3.m_OffsetEnd = 600.0f; - params3.m_OffsetStart = 100.0f; - params3.m_Text = "√2+√3=?-fghjkfghjf---_________----+"; - params3.m_TextFont = params.m_primaryTextFont; + params3.m_offsetEnd = 600.0f; + params3.m_offsetStart = 100.0f; + params3.m_text = "√2+√3=?-fghjkfghjf---_________----+"; + params3.m_textFont = params.m_primaryTextFont; PathTextShape sh3(path, params3); sh3.Draw(m_batcher.GetRefPointer(), m_textures.GetRefPointer());