diff options
author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-06-30 15:02:54 +0300 |
---|---|---|
committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-07-01 09:46:40 +0300 |
commit | cd6792e04d95b30d9f4669f59f08aa99794d4b11 (patch) | |
tree | cce644dfec69dc7be9b336ed1a921a6ad874a665 /drape | |
parent | 517c506328c3e2c5504178cd59a65ddfc320b9cd (diff) |
Added displaying of hotel info if any hotel is selected
Diffstat (limited to 'drape')
-rw-r--r-- | drape/overlay_handle.cpp | 12 | ||||
-rw-r--r-- | drape/overlay_handle.hpp | 10 |
2 files changed, 9 insertions, 13 deletions
diff --git a/drape/overlay_handle.cpp b/drape/overlay_handle.cpp index fd1179453a..8b6ecf8832 100644 --- a/drape/overlay_handle.cpp +++ b/drape/overlay_handle.cpp @@ -199,16 +199,13 @@ uint64_t OverlayHandle::GetPriorityInFollowingMode() const { return GetPriority(); } - - -SquareHandle::SquareHandle(FeatureID const & id, dp::Anchor anchor, - m2::PointD const & gbPivot, m2::PointD const & pxSize, - uint64_t priority, - string const & debugStr, - bool isBillboard) +SquareHandle::SquareHandle(FeatureID const & id, dp::Anchor anchor, m2::PointD const & gbPivot, + m2::PointD const & pxSize, uint64_t priority, bool isBound, + string const & debugStr, bool isBillboard) : TBase(id, anchor, priority, isBillboard) , m_gbPivot(gbPivot) , m_pxHalfSize(pxSize.x / 2.0, pxSize.y / 2.0) + , m_isBound(isBound) #ifdef DEBUG_OVERLAYS_OUTPUT , m_debugStr(debugStr) #endif @@ -242,6 +239,7 @@ void SquareHandle::GetPixelShape(ScreenBase const & screen, bool perspective, Re rects.emplace_back(GetPixelRect(screen, perspective)); } +bool SquareHandle::IsBound() const { return m_isBound; } #ifdef DEBUG_OVERLAYS_OUTPUT string SquareHandle::GetOverlayDebugInfo() { diff --git a/drape/overlay_handle.hpp b/drape/overlay_handle.hpp index ab16ab166c..8706f6ddc8 100644 --- a/drape/overlay_handle.hpp +++ b/drape/overlay_handle.hpp @@ -141,16 +141,13 @@ class SquareHandle : public OverlayHandle using TBase = OverlayHandle; public: - SquareHandle(FeatureID const & id, - dp::Anchor anchor, - m2::PointD const & gbPivot, - m2::PointD const & pxSize, - uint64_t priority, - string const & debugStr, + SquareHandle(FeatureID const & id, dp::Anchor anchor, m2::PointD const & gbPivot, + m2::PointD const & pxSize, uint64_t priority, bool isBound, string const & debugStr, bool isBillboard = false); m2::RectD GetPixelRect(ScreenBase const & screen, bool perspective) const override; void GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const override; + bool IsBound() const override; #ifdef DEBUG_OVERLAYS_OUTPUT virtual string GetOverlayDebugInfo() override; @@ -159,6 +156,7 @@ public: private: m2::PointD m_gbPivot; m2::PointD m_pxHalfSize; + bool m_isBound; #ifdef DEBUG_OVERLAYS_OUTPUT string m_debugStr; |