From f0b5c83fdcdbf2431cfd7585112921f0b7b03ecb Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Mon, 23 Apr 2018 11:18:11 +0300 Subject: [PATCH] Fixed search mark appearance on Android --- drape/overlay_tree.cpp | 1 + drape_frontend/frontend_renderer.cpp | 2 ++ drape_frontend/message_subclasses.hpp | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp index d9672d9c50..ed0306dcaf 100644 --- a/drape/overlay_tree.cpp +++ b/drape/overlay_tree.cpp @@ -378,6 +378,7 @@ bool OverlayTree::GetSelectedFeatureRect(ScreenBase const & screen, m2::RectD & featureRect.MakeEmpty(); for (auto const & handle : m_handlesCache) { + CHECK(handle != nullptr, ()); if (handle->IsVisible() && handle->GetOverlayID().m_featureId == m_selectedFeatureID) { m2::RectD rect = handle->GetPixelRect(screen, screen.isPerspective()); diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index cbcb592102..e296b6d5b8 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -1700,7 +1700,9 @@ bool FrontendRenderer::OnNewVisibleViewport(m2::RectD const & oldViewport, gOffset = m2::PointD(0, 0); if (m_myPositionController->IsModeChangeViewport() || m_selectionShape == nullptr || oldViewport == newViewport) + { return false; + } ScreenBase const & screen = m_userEventStream.GetCurrentScreen(); diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp index 3bd163b4e6..93c1b14e26 100644 --- a/drape_frontend/message_subclasses.hpp +++ b/drape_frontend/message_subclasses.hpp @@ -511,7 +511,8 @@ public: , m_isDismiss(true) {} - SelectObjectMessage(SelectionShape::ESelectedObject selectedObject, m2::PointD const & glbPoint, FeatureID const & featureID, bool isAnim) + SelectObjectMessage(SelectionShape::ESelectedObject selectedObject, + m2::PointD const & glbPoint, FeatureID const & featureID, bool isAnim) : m_selected(selectedObject) , m_glbPoint(glbPoint) , m_featureID(featureID) @@ -520,7 +521,7 @@ public: {} Type GetType() const override { return SelectObject; } - bool IsGLContextDependent() const override { return true; } + bool IsGLContextDependent() const override { return false; } m2::PointD const & GetPosition() const { return m_glbPoint; } SelectionShape::ESelectedObject GetSelectedObject() const { return m_selected; }