Removed obsolete code in OverlayTree

6 files changed, 19 insertions, 24 deletions

diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp
index 94b497a2cf..6296a853bf 100644
--- a/drape/overlay_tree.cpp
+++ b/drape/overlay_tree.cpp
@@ -17,9 +17,9 @@ namespace
 class HandleComparator
 {
 public:
-  bool operator()(OverlayTree::THandle const & l, OverlayTree::THandle const & r) const
+  bool operator()(ref_ptr<OverlayHandle> const & l, ref_ptr<OverlayHandle> const & r) const
   {  
-    return IsGreater(l.first, r.first);
+    return IsGreater(l, r);
   }
 
   bool IsGreater(ref_ptr<OverlayHandle> const & l, ref_ptr<OverlayHandle> const & r) const
@@ -83,7 +83,7 @@ void OverlayTree::StartOverlayPlacing(ScreenBase const & screen)
   m_traits.m_modelView = screen;
 }
 
-void OverlayTree::Add(ref_ptr<OverlayHandle> handle, bool isTransparent)
+void OverlayTree::Add(ref_ptr<OverlayHandle> handle)
 {
   ASSERT(IsNeedUpdate(), ());
 
@@ -103,10 +103,10 @@ void OverlayTree::Add(ref_ptr<OverlayHandle> handle, bool isTransparent)
 
   int const rank = handle->GetOverlayRank();
   ASSERT_LESS(rank, m_handles.size(), ());
-  m_handles[rank].emplace_back(make_pair(handle, isTransparent));
+  m_handles[rank].emplace_back(handle);
 }
 
-void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle, bool isTransparent,
+void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle,
                                detail::OverlayInfo const & parentOverlay)
 {
   ASSERT(IsNeedUpdate(), ());
@@ -121,8 +121,7 @@ void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle, bool isTransparent
   ForEachInRect(pixelRect, [&] (detail::OverlayInfo const & info)
   {
     bool const isParent = (info == parentOverlay);
-    if (!isParent && isTransparent == info.m_isTransparent &&
-        handle->IsIntersect(modelView, info.m_handle))
+    if (!isParent && handle->IsIntersect(modelView, info.m_handle))
       elements.push_back(info);
   });
 
@@ -162,7 +161,7 @@ void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle, bool isTransparent
 
   m_handlesToDelete.clear();
 
-  TBase::Add(detail::OverlayInfo(handle, isTransparent), pixelRect);
+  TBase::Add(detail::OverlayInfo(handle), pixelRect);
 }
 
 void OverlayTree::EndOverlayPlacing()
@@ -177,10 +176,10 @@ void OverlayTree::EndOverlayPlacing()
     for (auto const & handle : m_handles[rank])
     {
       detail::OverlayInfo parentOverlay;
-      if (!CheckHandle(handle.first, rank, parentOverlay))
+      if (!CheckHandle(handle, rank, parentOverlay))
         continue;
 
-      InsertHandle(handle.first, handle.second, parentOverlay);
+      InsertHandle(handle, parentOverlay);
     }
 
     m_handles[rank].clear();
diff --git a/drape/overlay_tree.hpp b/drape/overlay_tree.hpp
index 3979892c83..14e4f00b16 100644
--- a/drape/overlay_tree.hpp
+++ b/drape/overlay_tree.hpp
@@ -19,17 +19,15 @@ namespace detail
 struct OverlayInfo
 {
   ref_ptr<OverlayHandle> m_handle;
-  bool m_isTransparent = false;
 
   OverlayInfo() = default;
-  OverlayInfo(ref_ptr<OverlayHandle> handle, bool isTransparent)
+  OverlayInfo(ref_ptr<OverlayHandle> handle)
     : m_handle(handle)
-    , m_isTransparent(isTransparent)
   {}
 
   bool operator==(OverlayInfo const & rhs) const
   {
-    return m_handle == rhs.m_handle && m_isTransparent == rhs.m_isTransparent;
+    return m_handle == rhs.m_handle;
   }
 };
 
@@ -57,24 +55,22 @@ public:
   void ForceUpdate();
 
   void StartOverlayPlacing(ScreenBase const & screen);
-  void Add(ref_ptr<OverlayHandle> handle, bool isTransparent);
+  void Add(ref_ptr<OverlayHandle> handle);
   void EndOverlayPlacing();
 
   using TSelectResult = buffer_vector<ref_ptr<OverlayHandle>, 8>;
   void Select(m2::RectD const & rect, TSelectResult & result) const;
 
-  using THandle = pair<ref_ptr<OverlayHandle>, bool>;
-
 private:
   ScreenBase const & GetModelView() const { return m_traits.m_modelView; }
-  void InsertHandle(ref_ptr<OverlayHandle> handle, bool isTransparent,
+  void InsertHandle(ref_ptr<OverlayHandle> handle,
                     detail::OverlayInfo const & parentOverlay);
   bool CheckHandle(ref_ptr<OverlayHandle> handle, int currentRank,
                    detail::OverlayInfo & parentOverlay) const;
   void AddHandleToDelete(detail::OverlayInfo const & overlay);
 
   int m_frameCounter;
-  array<vector<THandle>, dp::OverlayRanksCount> m_handles;
+  array<vector<ref_ptr<OverlayHandle>>, dp::OverlayRanksCount> m_handles;
   vector<detail::OverlayInfo> m_handlesToDelete;
 };
 
diff --git a/drape/render_bucket.cpp b/drape/render_bucket.cpp
index 0207f2e360..f3ef8877c0 100644
--- a/drape/render_bucket.cpp
+++ b/drape/render_bucket.cpp
@@ -65,10 +65,10 @@ void RenderBucket::Update(ScreenBase const & modelView)
   }
 }
 
-void RenderBucket::CollectOverlayHandles(ref_ptr<OverlayTree> tree, bool isTransparent)
+void RenderBucket::CollectOverlayHandles(ref_ptr<OverlayTree> tree)
 {
   for (drape_ptr<OverlayHandle> const & overlayHandle : m_overlay)
-    tree->Add(make_ref(overlayHandle), isTransparent);
+    tree->Add(make_ref(overlayHandle));
 }
 
 void RenderBucket::Render(ScreenBase const & screen)
diff --git a/drape/render_bucket.hpp b/drape/render_bucket.hpp
index 357ed5c200..ec65e14cd5 100644
--- a/drape/render_bucket.hpp
+++ b/drape/render_bucket.hpp
@@ -26,7 +26,7 @@ public:
   void AddOverlayHandle(drape_ptr<OverlayHandle> && handle);
 
   void Update(ScreenBase const & modelView);
-  void CollectOverlayHandles(ref_ptr<OverlayTree> tree, bool isTransparent);
+  void CollectOverlayHandles(ref_ptr<OverlayTree> tree);
   void Render(ScreenBase const & screen);
 
   // Only for testing! Don't use this function in production code!
diff --git a/drape_frontend/render_group.cpp b/drape_frontend/render_group.cpp
index 9e95a1a0a5..820c7f1e3c 100755
--- a/drape_frontend/render_group.cpp
+++ b/drape_frontend/render_group.cpp
@@ -66,7 +66,7 @@ void RenderGroup::CollectOverlay(ref_ptr<dp::OverlayTree> tree)
   ASSERT(m_shader != nullptr, ());
   ASSERT(m_generalUniforms != nullptr, ());
   for (auto & renderBucket : m_renderBuckets)
-    renderBucket->CollectOverlayHandles(tree, false /* isTransparent */);
+    renderBucket->CollectOverlayHandles(tree);
 }
 
 void RenderGroup::Render(ScreenBase const & screen)
diff --git a/drape_head/testing_engine.cpp b/drape_head/testing_engine.cpp
index a7fdc82117..c15b5667f4 100644
--- a/drape_head/testing_engine.cpp
+++ b/drape_head/testing_engine.cpp
@@ -396,7 +396,7 @@ void TestingEngine::Draw()
     dp::OverlayTree tree;
     tree.StartOverlayPlacing(m_modelView);
     for (size_t i = 0; i < buckets.size(); ++i)
-      buckets[i]->CollectOverlayHandles(make_ref(&tree), false);
+      buckets[i]->CollectOverlayHandles(make_ref(&tree));
     for (size_t i = 0; i < buckets.size(); ++i)
       buckets[i]->Render(m_modelView);
     tree.EndOverlayPlacing();