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

Review fixes.

Browse source
This commit is contained in:
Daria Volvenkova 2016-02-17 17:32:10 +03:00 • committed by Sergey Yershov
parent 26d7b5ee48
commit 0df079d542
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -208,11 +208,11 @@ void Framework::Get3dMode(bool & allow3d, bool & allow3dBuildings)
m_work.Load3dMode(allow3d, allow3dBuildings);
}
void Framework::SetChoosePositionMode(bool enable)
void Framework::SetChoosePositionMode(bool isChoosePositionMode)
{
m_isChoosePositionMode = enable;
m_work.BlockTapEvents(enable);
m_work.EnableChoosePositionMode(enable);
m_isChoosePositionMode = isChoosePositionMode;
m_work.BlockTapEvents(isChoosePositionMode);
m_work.EnableChoosePositionMode(isChoosePositionMode);
}
Storage & Framework::Storage()

2
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -157,7 +157,7 @@ namespace android
void Set3dMode(bool allow3d, bool allow3dBuildings);
void Get3dMode(bool & allow3d, bool & allow3dBuildings);
void SetChoosePositionMode(bool enable);
void SetChoosePositionMode(bool isChoosePositionMode);
void SetupWidget(gui::EWidget widget, float x, float y, dp::Anchor anchor);
void ApplyWidgets();

6
drape_frontend/gui/choose_position_mark.cpp
View file

@ -42,14 +42,14 @@ public:
}
};
}
} // namespace
drape_ptr<ShapeRenderer> ChoosePositionMark::Draw(ref_ptr<dp::TextureManager> tex) const
{
dp::TextureManager::SymbolRegion region;
tex->GetSymbolRegion("cross_geoposition", region);
glsl::vec2 halfSize = glsl::ToVec2(m2::PointD(region.GetPixelSize()) * 0.5);
m2::RectF texRect = region.GetTexRect();
glsl::vec2 const halfSize = glsl::ToVec2(m2::PointD(region.GetPixelSize()) * 0.5);
m2::RectF const texRect = region.GetTexRect();
ASSERT_EQUAL(m_position.m_anchor, dp::Center, ());
ChoosePositionMarkVertex vertexes[] =

2
drape_frontend/gui/layer_render.cpp
View file

@ -221,7 +221,7 @@ drape_ptr<LayerRenderer> LayerCacher::RecacheCountryStatus(ref_ptr<dp::TextureMa
drape_ptr<LayerRenderer> LayerCacher::RecacheChoosePositionMark(ref_ptr<dp::TextureManager> textures)
{
m2::PointF surfSize = DrapeGui::Instance().GetSurfaceSize();
m2::PointF const surfSize = DrapeGui::Instance().GetSurfaceSize();
drape_ptr<LayerRenderer> renderer = make_unique_dp<LayerRenderer>();
ChoosePositionMark positionMark = ChoosePositionMark(Position(surfSize * 0.5f, dp::Center));

2
drape_frontend/gui/skin.hpp
View file

@ -15,7 +15,7 @@ enum EWidget
WIDGET_COMPASS = 0x2,
WIDGET_COPYRIGHT = 0x4,
WIDGET_SCALE_LABEL = 0x8,
/// WIDGET_COUNTRY_STATUS - controlled by rendering kernel. Don't use it in platform code
/// Following widgets controlled by rendering kernel. Don't use them in platform code
WIDGET_COUNTRY_STATUS = 0x8000,
WIDGET_CHOOSE_POSITION_MARK = 0x8001
};