diff --git a/drape_frontend/shape_view_params.hpp b/drape_frontend/shape_view_params.hpp index fd994aae9b..640b3eec98 100644 --- a/drape_frontend/shape_view_params.hpp +++ b/drape_frontend/shape_view_params.hpp @@ -1,28 +1,16 @@ #pragma once -#include "../indexer/feature_decl.hpp" - +#include "../drape/drape_global.hpp" #include "../drape/color.hpp" +#include "../indexer/feature_decl.hpp" +#include "../geometry/point2d.hpp" + #include "../std/string.hpp" namespace df { -enum LineCap -{ - SquareCap = -1, - RoundCap = 0, - ButtCap = 1, -}; - -enum LineJoin -{ - MiterJoin = -1, - BevelJoin = 0, - RoundJoin = 1, -}; - struct CommonViewParams { float m_depth; @@ -54,8 +42,28 @@ struct LineViewParams : CommonViewParams { Color m_color; float m_width; - LineCap m_cap; - LineJoin m_join; + dp::LineCap m_cap; + dp::LineJoin m_join; +}; + +struct FontDecl +{ + Color m_color; + Color m_outlineColor; + float m_size; + bool m_needOutline; +}; + +struct TextViewParams : CommonViewParams +{ + FeatureID m_featureID; + FontDecl m_primaryTextFont; + string m_primaryText; + m2::PointF m_primaryOffset; + FontDecl m_secondaryTextFont; + string m_secondaryText; + m2::PointF m_secondaryOffset; + dp::Anchor m_anchor; }; } // namespace df