diff --git a/drape_frontend/transit_scheme_builder.cpp b/drape_frontend/transit_scheme_builder.cpp index 50c7129941..e8f7e738ad 100644 --- a/drape_frontend/transit_scheme_builder.cpp +++ b/drape_frontend/transit_scheme_builder.cpp @@ -683,7 +683,7 @@ void TransitSchemeBuilder::GenerateStop(StopNodeParams const & params, m2::Point } void TransitSchemeBuilder::GenerateTitles(StopNodeParams const & stopParams, m2::PointD const & pivot, - vector const & markerSizes, + std::vector const & markerSizes, ref_ptr textures, dp::Batcher & batcher) { auto const vs = static_cast(df::VisualParams::Instance().GetVisualScale()); @@ -701,6 +701,11 @@ void TransitSchemeBuilder::GenerateTitles(StopNodeParams const & stopParams, m2: ASSERT_LESS_OR_EQUAL(priority, static_cast(stopParams.m_isTransfer ? Priority::TransferMax : Priority::StopMax), ()); + std::vector symbolSizes; + symbolSizes.reserve(markerSizes.size()); + for (auto const & sz : markerSizes) + symbolSizes.push_back(sz * 1.1f); + dp::TitleDecl titleDecl; titleDecl.m_primaryOptional = true; titleDecl.m_primaryTextFont.m_color = df::GetColorConstant(kTransitMarkText); @@ -722,7 +727,7 @@ void TransitSchemeBuilder::GenerateTitles(StopNodeParams const & stopParams, m2: textParams.m_specialPriority = priority; textParams.m_startOverlayRank = dp::OverlayRank0; - TextShape(stopParams.m_pivot, textParams, TileKey(), markerSizes, title.m_offset, dp::Center, kTransitOverlayIndex) + TextShape(stopParams.m_pivot, textParams, TileKey(), symbolSizes, title.m_offset, dp::Center, kTransitOverlayIndex) .Draw(&batcher, textures); } diff --git a/drape_frontend/transit_scheme_builder.hpp b/drape_frontend/transit_scheme_builder.hpp index 567a728229..7c8610942f 100644 --- a/drape_frontend/transit_scheme_builder.hpp +++ b/drape_frontend/transit_scheme_builder.hpp @@ -158,8 +158,9 @@ private: void GenerateStop(StopNodeParams const & params, m2::PointD const & pivot, std::map const & lines, dp::Batcher & batcher); - void GenerateTitles(StopNodeParams const & params, m2::PointD const & pivot, vector const & markerSizes, - ref_ptr textures, dp::Batcher & batcher); + void GenerateTitles(StopNodeParams const & params, m2::PointD const & pivot, + std::vector const & markerSizes, ref_ptr textures, + dp::Batcher & batcher); void GenerateLine(std::vector const & path, m2::PointD const & pivot, dp::Color const & colorConst, float lineOffset, float halfWidth, float depth, dp::Batcher & batcher); diff --git a/drape_frontend/transit_scheme_renderer.cpp b/drape_frontend/transit_scheme_renderer.cpp index 23b2ed76f7..88d598eefa 100644 --- a/drape_frontend/transit_scheme_renderer.cpp +++ b/drape_frontend/transit_scheme_renderer.cpp @@ -140,7 +140,8 @@ void TransitSchemeRenderer::RenderTransit(ScreenBase const & screen, int zoomLev StencilWriterGuard guard(postprocessRenderer); RenderText(screen, mng, commonUniforms); } - RenderStubs(screen, mng, commonUniforms); + // Render only for debug purpose. + //RenderStubs(screen, mng, commonUniforms); } void TransitSchemeRenderer::CollectOverlays(ref_ptr tree, ScreenBase const & modelView)