AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed notes

Browse source
This commit is contained in:
Constantin Shalnev 2015-11-05 15:18:42 +03:00 • committed by r.kuznetsov
parent 6ae8e537bc
commit 5d66c91826
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drape_frontend/apply_feature_functors.cpp
View file

@ -29,6 +29,8 @@ namespace df
namespace
{
double const kMinVisibleFontSize = 8.0;
dp::Color ToDrapeColor(uint32_t src)
{
return dp::Extract(src, 255 - (src >> 24));
@ -144,7 +146,7 @@ void Extract(::LineDefProto const * lineRule,
void CaptionDefProtoToFontDecl(CaptionDefProto const * capRule, dp::FontDecl &params)
{
params.m_color = ToDrapeColor(capRule->color());
params.m_size = max(8.0, capRule->height() * df::VisualParams::Instance().GetVisualScale());
params.m_size = max(kMinVisibleFontSize, capRule->height() * df::VisualParams::Instance().GetVisualScale());
if (capRule->has_stroke_color())
params.m_outlineColor = ToDrapeColor(capRule->stroke_color());
@ -153,7 +155,7 @@ void CaptionDefProtoToFontDecl(CaptionDefProto const * capRule, dp::FontDecl &pa
void ShieldRuleProtoToFontDecl(ShieldRuleProto const * shieldRule, dp::FontDecl &params)
{
params.m_color = ToDrapeColor(shieldRule->color());
params.m_size = max(8.0, shieldRule->height() * df::VisualParams::Instance().GetVisualScale());
params.m_size = max(kMinVisibleFontSize, shieldRule->height() * df::VisualParams::Instance().GetVisualScale());
if (shieldRule->has_stroke_color())
params.m_outlineColor = ToDrapeColor(shieldRule->stroke_color());