kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Review fixes

Browse source
This commit is contained in:
r.kuznetsov 2016-01-06 10:11:33 +03:00 • committed by Constantin Shalnev
parent 41199b2928
commit e243cd65cb
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drape_frontend/color_constants.cpp
View file

@ -12,13 +12,13 @@ unordered_map<int, unordered_map<int, dp::Color>> kColorConstants =
{
{ MapStyleClear,
{
{ DownloadButton, dp::Color(0, 0, 0, 0.44 * 255) },
{ DownloadButton, dp::Color(0, 0, 0, 112) },
{ DownloadButtonRouting, dp::Color(32, 152, 82, 255) },
{ DownloadButtonPressed, dp::Color(0, 0, 0, 0.72 * 255) },
{ DownloadButtonPressed, dp::Color(0, 0, 0, 184) },
{ DownloadButtonRoutingPressed, dp::Color(24, 128, 68, 255) },
{ DownloadButtonText, dp::Color(255, 255, 255, 255) },
{ CountryStatusText, dp::Color(0, 0, 0, 255) },
{ GuiText, dp::Color(0x4D, 0x4D, 0x4D, 0xDD) },
{ GuiText, dp::Color(77, 77, 77, 221) },
{ MyPositionAccuracy, dp::Color(30, 150, 240, 20) },
{ Selection, dp::Color(30, 150, 240, 164) },
{ Route, dp::Color(30, 150, 240, 204) },

2
drape_frontend/gui/country_status.cpp
View file

@ -216,7 +216,7 @@ drape_ptr<ShapeRenderer> CountryStatus::Draw(ref_ptr<dp::TextureManager> tex,
params.m_margin = 5.0f * visualScale;
params.m_facet = 8.0f * visualScale;
MapStyle style = GetStyleReader().GetCurrentStyle();
MapStyle const style = GetStyleReader().GetCurrentStyle();
auto color = df::GetColorConstant(style, df::DownloadButton);
auto pressedColor = df::GetColorConstant(style, df::DownloadButtonPressed);
if (control.m_buttonType == CountryStatusHelper::BUTTON_TYPE_MAP_ROUTING)