From dc66e95b91e1f9506291e6dec6006e393ec36a1b Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Tue, 22 May 2018 13:38:33 +0300 Subject: [PATCH] Review fixes --- .../src/com/mapswithme/maps/MapFragment.java | 19 ++++++------------- .../src/com/mapswithme/maps/MwmActivity.java | 14 +++++++------- drape_frontend/gui/gui_text.hpp | 7 +++++-- drape_frontend/gui/layer_render.cpp | 2 +- drape_frontend/gui/ruler.cpp | 4 +++- drape_frontend/gui/ruler_helper.cpp | 2 +- drape_frontend/gui/watermark.cpp | 2 +- 7 files changed, 24 insertions(+), 26 deletions(-) diff --git a/android/src/com/mapswithme/maps/MapFragment.java b/android/src/com/mapswithme/maps/MapFragment.java index 9c7ac70623..27fbeee3c6 100644 --- a/android/src/com/mapswithme/maps/MapFragment.java +++ b/android/src/com/mapswithme/maps/MapFragment.java @@ -92,15 +92,8 @@ public class MapFragment extends BaseMwmFragment sWasCopyrightDisplayed = true; } - nativeSetupWidget(WIDGET_RULER, - UiUtils.dimen(R.dimen.margin_ruler_left), - mHeight - UiUtils.dimen(R.dimen.margin_ruler_bottom), - ANCHOR_LEFT_BOTTOM); - - nativeSetupWidget(WIDGET_WATERMARK, - UiUtils.dimen(R.dimen.margin_watermark_right), - mHeight - UiUtils.dimen(R.dimen.margin_watermark_bottom), - ANCHOR_RIGHT_BOTTOM); + setupRuler(0, false); + setupWatermark(0, false); if (BuildConfig.DEBUG) { @@ -126,20 +119,20 @@ public class MapFragment extends BaseMwmFragment nativeApplyWidgets(); } - void setupRuler(int offsetX, int offsetY, boolean forceRedraw) + void setupRuler(int offsetY, boolean forceRedraw) { nativeSetupWidget(WIDGET_RULER, - UiUtils.dimen(R.dimen.margin_ruler_left) + offsetX, + UiUtils.dimen(R.dimen.margin_ruler_left), mHeight - UiUtils.dimen(R.dimen.margin_ruler_bottom) + offsetY, ANCHOR_LEFT_BOTTOM); if (forceRedraw && mContextCreated) nativeApplyWidgets(); } - void setupWatermark(int offsetX, int offsetY, boolean forceRedraw) + void setupWatermark(int offsetY, boolean forceRedraw) { nativeSetupWidget(WIDGET_WATERMARK, - UiUtils.dimen(R.dimen.margin_watermark_right) + offsetX, + mWidth - UiUtils.dimen(R.dimen.margin_watermark_right), mHeight - UiUtils.dimen(R.dimen.margin_watermark_bottom) + offsetY, ANCHOR_RIGHT_BOTTOM); if (forceRedraw && mContextCreated) diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 4f25d578d9..ea418fbc3a 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -1539,7 +1539,7 @@ public class MwmActivity extends BaseMwmFragmentActivity public void run() { final int menuHeight = menu.getFrame().getHeight(); - adjustBottomWidgets(0, menuHeight); + adjustBottomWidgets(menuHeight); mIsFullscreenAnimating = false; if (mIsAppearMenuLater) @@ -1573,7 +1573,7 @@ public class MwmActivity extends BaseMwmFragmentActivity @Override public void run() { - adjustBottomWidgets(0, 0); + adjustBottomWidgets(0); } }); if (mNavMyPosition != null) @@ -1762,13 +1762,13 @@ public class MwmActivity extends BaseMwmFragmentActivity MapFragment.nativeCompassUpdated(compass.getMagneticNorth(), compass.getTrueNorth(), true); } - private void adjustBottomWidgets(int offsetX, int offsetY) + private void adjustBottomWidgets(int offsetY) { if (mMapFragment == null || !mMapFragment.isAdded()) return; - mMapFragment.setupRuler(offsetX, offsetY, true); - mMapFragment.setupWatermark(offsetX, offsetY, true); + mMapFragment.setupRuler(offsetY, false); + mMapFragment.setupWatermark(offsetY, true); } @Override @@ -1855,7 +1855,7 @@ public class MwmActivity extends BaseMwmFragmentActivity public void run() { final int menuHeight = getCurrentMenu().getFrame().getHeight(); - adjustBottomWidgets(0, menuHeight); + adjustBottomWidgets(menuHeight); if (completion != null) completion.run(); } @@ -1957,7 +1957,7 @@ public class MwmActivity extends BaseMwmFragmentActivity @Override public void run() { - adjustBottomWidgets(0, 0); + adjustBottomWidgets(0); } }); } diff --git a/drape_frontend/gui/gui_text.hpp b/drape_frontend/gui/gui_text.hpp index d35a81c3ae..ed623d5355 100644 --- a/drape_frontend/gui/gui_text.hpp +++ b/drape_frontend/gui/gui_text.hpp @@ -67,7 +67,9 @@ public: StaticVertex() = default; StaticVertex(glsl::vec3 const & position, glsl::vec2 const & color, glsl::vec2 const & outlineColor) - : m_position(position), m_color(color), m_outline(outlineColor) + : m_position(position) + , m_color(color) + , m_outline(outlineColor) {} static dp::BindingInfo const & GetBindingInfo(); @@ -81,7 +83,8 @@ public: { DynamicVertex() = default; DynamicVertex(glsl::vec2 const & normal, glsl::vec2 const & mask) - : m_normal(normal), m_maskTexCoord(mask) + : m_normal(normal) + , m_maskTexCoord(mask) {} static dp::BindingInfo const & GetBindingInfo(); diff --git a/drape_frontend/gui/layer_render.cpp b/drape_frontend/gui/layer_render.cpp index 26756d02e6..f882bd740d 100644 --- a/drape_frontend/gui/layer_render.cpp +++ b/drape_frontend/gui/layer_render.cpp @@ -230,7 +230,7 @@ drape_ptr LayerCacher::RecacheDebugLabels(ref_ptr renderer = make_unique_dp(); - float const vs = static_cast(df::VisualParams::Instance().GetVisualScale()); + auto const vs = static_cast(df::VisualParams::Instance().GetVisualScale()); DebugInfoLabels debugLabels = DebugInfoLabels(Position(m2::PointF(10.0f * vs, 50.0f * vs), dp::Center)); debugLabels.AddLabel(textures, "visible: km2, readed: km2, ratio:", diff --git a/drape_frontend/gui/ruler.cpp b/drape_frontend/gui/ruler.cpp index be1ab9a82d..c179fb5bb2 100644 --- a/drape_frontend/gui/ruler.cpp +++ b/drape_frontend/gui/ruler.cpp @@ -21,7 +21,9 @@ struct RulerVertex { RulerVertex() = default; RulerVertex(glsl::vec2 const & pos, glsl::vec2 const & normal, glsl::vec2 const & texCoord) - : m_position(pos), m_normal(normal), m_texCoord(texCoord) + : m_position(pos) + , m_normal(normal) + , m_texCoord(texCoord) {} glsl::vec2 m_position; diff --git a/drape_frontend/gui/ruler_helper.cpp b/drape_frontend/gui/ruler_helper.cpp index 06067e337e..22be59f7f2 100644 --- a/drape_frontend/gui/ruler_helper.cpp +++ b/drape_frontend/gui/ruler_helper.cpp @@ -101,7 +101,7 @@ double Identity(double val) } // namespace RulerHelper::RulerHelper() - : m_pixelLength(0.0) + : m_pixelLength(0.0f) , m_rangeIndex(kInvalidUnitValue) , m_isTextDirty(false) , m_dirtyTextRequested(false) diff --git a/drape_frontend/gui/watermark.cpp b/drape_frontend/gui/watermark.cpp index 1905376635..1e88f4ef8f 100644 --- a/drape_frontend/gui/watermark.cpp +++ b/drape_frontend/gui/watermark.cpp @@ -35,7 +35,7 @@ public: { SetIsVisible(true); - m2::PointD halfSize(0.5 * size.x , 0.5 * size.y); + m2::PointF const halfSize(0.5f * size.x , 0.5f * size.y); m_offset = glsl::vec2(0.0f, 0.0f); if (anchor & dp::Left)