From 6cd77c109804e778288f24a41a8e91b5f04d48fa Mon Sep 17 00:00:00 2001 From: Anatoliy Tomilov Date: Mon, 7 Sep 2020 21:09:53 +0500 Subject: [PATCH] [drape] [Booking] Shift non-Booking and non-hotels searchmarks vertically to fit selection geometry HOTELS-14776 --- map/search_mark.cpp | 15 +++++++++++++++ map/search_mark.hpp | 2 ++ 2 files changed, 17 insertions(+) diff --git a/map/search_mark.cpp b/map/search_mark.cpp index f78561e48b..d16829fb27 100644 --- a/map/search_mark.cpp +++ b/map/search_mark.cpp @@ -241,6 +241,13 @@ SearchMarkPoint::SearchMarkPoint(m2::PointD const & ptOrg) { } +m2::PointD SearchMarkPoint::GetPixelOffset() const +{ + if (!IsBookingSpecialMark() && !IsHotel()) + return {0.0, 4.0}; + return {}; +} + drape_ptr SearchMarkPoint::GetSymbolNames() const { auto const symbolName = GetSymbolName(); @@ -356,6 +363,14 @@ drape_ptr SearchMarkPoint::GetBadgeInfo() const return nullptr; } +drape_ptr SearchMarkPoint::GetSymbolOffsets() const +{ + m2::PointF offset; + if (!IsBookingSpecialMark() && !IsHotel()) + offset = m2::PointF{0.0, 1.0}; + return make_unique_dp(static_cast(scales::UPPER_STYLE_SCALE), offset); +} + bool SearchMarkPoint::IsMarkAboveText() const { return !IsBookingSpecialMark(); diff --git a/map/search_mark.hpp b/map/search_mark.hpp index 2b7a0596c7..5303e2f900 100644 --- a/map/search_mark.hpp +++ b/map/search_mark.hpp @@ -30,12 +30,14 @@ public: explicit SearchMarkPoint(m2::PointD const & ptOrg); + m2::PointD GetPixelOffset() const override; drape_ptr GetSymbolNames() const override; df::ColorConstant GetColorConstant() const override; drape_ptr GetTitleDecl() const override; int GetMinTitleZoom() const override; df::DepthLayer GetDepthLayer() const override; drape_ptr GetBadgeInfo() const override; + drape_ptr GetSymbolOffsets() const override; bool GetDepthTestEnabled() const override { return false; } bool IsMarkAboveText() const override; float GetSymbolOpacity() const override;