Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/drape
diff options
context:
space:
mode:
authorDaria Volvenkova <d.volvenkova@corp.mail.ru>2016-06-22 18:50:38 +0300
committerVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-06-24 16:02:11 +0300
commit7e9ebe3541c7df65b7117c12eb77f223eb61bbf4 (patch)
treeb7fa2e27d2475b8b16c50bfb31b48b49c345c9a5 /drape
parentd8624aeb268641b576c1d9a09caf1919e9c052b1 (diff)
Selected feature's overlays couldn't be displaced.
Diffstat (limited to 'drape')
-rw-r--r--drape/overlay_tree.cpp6
1 files 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<OverlayHandle> 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)