diff options
| author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2019-03-21 15:18:23 +0300 |
|---|---|---|
| committer | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2019-03-25 15:47:46 +0300 |
| commit | 3e73c24a90fc97b10135fcaf0bd681c7b29211b9 (patch) | |
| tree | 152ae7711bceb95edcce2118c23d1c801293a9c0 /drape_frontend | |
| parent | f279190bf7432e72709156f1dfd57deaa5da81d1 (diff) | |
Review fixes.
Diffstat (limited to 'drape_frontend')
| -rw-r--r-- | drape_frontend/drape_engine.cpp | 2 | ||||
| -rw-r--r-- | drape_frontend/user_mark_shapes.cpp | 2 | ||||
| -rw-r--r-- | drape_frontend/user_mark_shapes.hpp | 2 | ||||
| -rw-r--r-- | drape_frontend/user_marks_provider.hpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp index 5f1b23e92c..d270f90e49 100644 --- a/drape_frontend/drape_engine.cpp +++ b/drape_frontend/drape_engine.cpp @@ -853,7 +853,7 @@ drape_ptr<UserMarkRenderParams> DrapeEngine::GenerateMarkRenderInfo(UserPointMar renderInfo->m_minZoom = mark->GetMinZoom(); renderInfo->m_minTitleZoom = mark->GetMinTitleZoom(); renderInfo->m_isVisible = mark->IsVisible(); - renderInfo->m_autoVisibleMinZoom = mark->GetAutoVisibleMinZoom(); + renderInfo->m_alwaysVisibleMinZoom = mark->GetAlwaysVisibleMinZoom(); renderInfo->m_pivot = mark->GetPivot(); renderInfo->m_pixelOffset = mark->GetPixelOffset(); renderInfo->m_titleDecl = mark->GetTitleDecl(); diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp index 8f2b075c83..89cbab0a60 100644 --- a/drape_frontend/user_mark_shapes.cpp +++ b/drape_frontend/user_mark_shapes.cpp @@ -362,7 +362,7 @@ void CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKe continue; UserMarkRenderParams & renderInfo = *it->second; - if (!renderInfo.m_isVisible && renderInfo.m_autoVisibleMinZoom > tileKey.m_zoomLevel) + if (!renderInfo.m_isVisible && renderInfo.m_alwaysVisibleMinZoom > tileKey.m_zoomLevel) continue; m2::PointD const tileCenter = tileKey.GetGlobalRect().Center(); diff --git a/drape_frontend/user_mark_shapes.hpp b/drape_frontend/user_mark_shapes.hpp index 184a52d52c..fab562887b 100644 --- a/drape_frontend/user_mark_shapes.hpp +++ b/drape_frontend/user_mark_shapes.hpp @@ -39,7 +39,7 @@ struct UserMarkRenderParams bool m_hasCreationAnimation = false; bool m_justCreated = false; bool m_isVisible = true; - int m_autoVisibleMinZoom = std::numeric_limits<int>::max(); + int m_alwaysVisibleMinZoom = std::numeric_limits<int>::max(); FeatureID m_featureId; bool m_isMarkAboveText = false; }; diff --git a/drape_frontend/user_marks_provider.hpp b/drape_frontend/user_marks_provider.hpp index 2740495bd9..5f6d729716 100644 --- a/drape_frontend/user_marks_provider.hpp +++ b/drape_frontend/user_marks_provider.hpp @@ -65,7 +65,7 @@ public: virtual float GetDepth() const = 0; virtual DepthLayer GetDepthLayer() const = 0; virtual bool IsVisible() const = 0; - virtual int GetAutoVisibleMinZoom() const = 0; + virtual int GetAlwaysVisibleMinZoom() const = 0; virtual drape_ptr<TitlesInfo> GetTitleDecl() const = 0; virtual drape_ptr<SymbolNameZoomInfo> GetSymbolNames() const = 0; virtual drape_ptr<SymbolNameZoomInfo> GetBadgeNames() const = 0; |