From 7e9ebe3541c7df65b7117c12eb77f223eb61bbf4 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Wed, 22 Jun 2016 18:50:38 +0300 Subject: [PATCH] Selected feature's overlays couldn't be displaced. --- drape/overlay_tree.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp index 84a31866f5..e09b5ed0e8 100644 --- a/drape/overlay_tree.cpp +++ b/drape/overlay_tree.cpp @@ -209,15 +209,17 @@ void OverlayTree::InsertHandle(ref_ptr handle, // But if some of already inserted elements have more priority, then we don't insert "handle". for (auto const & rivalHandle : rivals) { + bool const rejectBySelected = m_selectedFeatureID.IsValid() && (rivalHandle->GetFeatureID() == m_selectedFeatureID); + bool rejectByDepth = false; - if (modelView.isPerspective()) + if (!rejectBySelected && modelView.isPerspective()) { bool const pathTextComparation = handle->HasDynamicAttributes() || rivalHandle->HasDynamicAttributes(); rejectByDepth = !pathTextComparation && handleToCompare->GetPivot(modelView, true).y > rivalHandle->GetPivot(modelView, true).y; } - if (rejectByDepth || comparator.IsGreater(rivalHandle, handleToCompare)) + if (rejectBySelected || rejectByDepth || comparator.IsGreater(rivalHandle, handleToCompare)) { // Handle is displaced and bound to its parent, parent will be displaced too. if (boundToParent)