diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index ec951c72a5..3dd625a651 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -157,7 +157,7 @@ bool Framework::CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi p.m_widgetsInitInfo[widget] = pos; }); - p.m_widgetsInitInfo[gui::WIDGET_SCALE_LABLE] = gui::Position(dp::LeftBottom); + p.m_widgetsInitInfo[gui::WIDGET_SCALE_LABEL] = gui::Position(dp::LeftBottom); m_work.LoadBookmarks(); m_work.SetMyPositionModeListener(bind(&Framework::MyPositionModeChanged, this, _1)); diff --git a/android/jni/com/mapswithme/maps/RenderFragment.cpp b/android/jni/com/mapswithme/maps/RenderFragment.cpp index edac043b44..05a3a3172f 100644 --- a/android/jni/com/mapswithme/maps/RenderFragment.cpp +++ b/android/jni/com/mapswithme/maps/RenderFragment.cpp @@ -6,9 +6,9 @@ extern "C" { JNIEXPORT jboolean JNICALL -Java_com_mapswithme_maps_RenderFragment_createEngine(JNIEnv * env, jobject thiz, jobject surface, jint destiny) +Java_com_mapswithme_maps_RenderFragment_createEngine(JNIEnv * env, jobject thiz, jobject surface, jint density) { - return static_cast(g_framework->CreateDrapeEngine(env, surface, static_cast(destiny))); + return static_cast(g_framework->CreateDrapeEngine(env, surface, static_cast(density))); } JNIEXPORT void JNICALL diff --git a/drape_frontend/gui/layer_render.cpp b/drape_frontend/gui/layer_render.cpp index af945d8d45..d5725b4851 100644 --- a/drape_frontend/gui/layer_render.cpp +++ b/drape_frontend/gui/layer_render.cpp @@ -167,7 +167,7 @@ drape_ptr LayerCacher::RecacheWidgets(TWidgetsInitInfo const & in make_pair(WIDGET_COMPASS, bind(&LayerCacher::CacheCompass, this, _1, _2, _3)), make_pair(WIDGET_RULER, bind(&LayerCacher::CacheRuler, this, _1, _2, _3)), make_pair(WIDGET_COPYRIGHT, bind(&LayerCacher::CacheCopyright, this, _1, _2, _3)), - make_pair(WIDGET_SCALE_LABLE, bind(&LayerCacher::CacheScaleLabel, this, _1, _2, _3)) + make_pair(WIDGET_SCALE_LABEL, bind(&LayerCacher::CacheScaleLabel, this, _1, _2, _3)) }; drape_ptr renderer = make_unique_dp(); @@ -244,7 +244,7 @@ m2::PointF LayerCacher::CacheScaleLabel(Position const & position, ref_ptr scaleRenderer = make_unique_dp(); m2::PointF size = MutableLabelDrawer::Draw(params, textures, bind(&ShapeRenderer::AddShape, scaleRenderer.get(), _1, _2)); - renderer->AddShapeRenderer(WIDGET_SCALE_LABLE, move(scaleRenderer)); + renderer->AddShapeRenderer(WIDGET_SCALE_LABEL, move(scaleRenderer)); return size; } diff --git a/drape_frontend/gui/skin.hpp b/drape_frontend/gui/skin.hpp index d1f059a417..d49a369858 100644 --- a/drape_frontend/gui/skin.hpp +++ b/drape_frontend/gui/skin.hpp @@ -14,7 +14,7 @@ enum EWidget WIDGET_RULER = 0x1, WIDGET_COMPASS = 0x2, WIDGET_COPYRIGHT = 0x4, - WIDGET_SCALE_LABLE = 0x8, + WIDGET_SCALE_LABEL = 0x8, /// WIDGET_COUNTRY_STATUS - controlled by rendering kernel. Don't use it in platform code WIDGET_COUNTRY_STATUS = 0x8000 }; diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index e54476348f..3fc877ccf8 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -194,7 +194,7 @@ bool IsLocationEmulation(QMouseEvent * e) p.m_widgetsInitInfo[widget] = pos; }); - p.m_widgetsInitInfo[gui::WIDGET_SCALE_LABLE] = gui::Position(dp::LeftBottom); + p.m_widgetsInitInfo[gui::WIDGET_SCALE_LABEL] = gui::Position(dp::LeftBottom); m_framework->CreateDrapeEngine(make_ref(m_contextFactory), move(p)); m_framework->AddViewportListener(bind(&DrawWidget::OnViewportChanged, this, _1));