From 1b151d4618a40f448fd23926e82d36e282edad15 Mon Sep 17 00:00:00 2001 From: ExMix Date: Sun, 10 Aug 2014 20:20:33 +0300 Subject: [PATCH] [drape] remove useless fields for path text --- drape_frontend/apply_feature_functors.cpp | 3 --- drape_frontend/shape_view_params.hpp | 3 --- drape_head/testing_engine.cpp | 5 +---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp index 309b5bf2d5..11cb6e3584 100644 --- a/drape_frontend/apply_feature_functors.cpp +++ b/drape_frontend/apply_feature_functors.cpp @@ -309,9 +309,6 @@ void ApplyLineFeature::ProcessRule(Stylist::rule_wrapper_t const & rule) PathTextViewParams params; params.m_depth = depth; - params.m_featureID = m_id; - params.m_offsetStart = 0; - params.m_offsetEnd = 300; params.m_text = m_captions.GetPathName(); params.m_textFont = fontDecl; diff --git a/drape_frontend/shape_view_params.hpp b/drape_frontend/shape_view_params.hpp index 25526ec5fc..be5e286f46 100644 --- a/drape_frontend/shape_view_params.hpp +++ b/drape_frontend/shape_view_params.hpp @@ -67,11 +67,8 @@ struct TextViewParams : CommonViewParams struct PathTextViewParams : CommonViewParams { - FeatureID m_featureID; 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 2af58ac74b..f1b639bd3c 100644 --- a/drape_head/testing_engine.cpp +++ b/drape_head/testing_engine.cpp @@ -404,13 +404,10 @@ void TestingEngine::DrawImpl() path.push_back(m2::PointF(1600, 450)); 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; - PathTextShape sh3(path, params3); + PathTextShape sh3(path, params3, 1); sh3.Draw(m_batcher.GetRefPointer(), m_textures.GetRefPointer()); PathSymbolViewParams params4;