mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[drape] [Booking] Give higher priority to visual state for !isAvailable condition then for isPreparing condition MAPSME-14325

Browse source 
to eliminate flickering of selected unavailable hotels during map scrolling.
This commit is contained in:
Anatoliy Tomilov 2020-08-13 15:09:09 +05:00 • committed by Tatiana Yan
parent 29b4dff2af
commit 101fc0d971
1 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
map/search_mark.cpp
View file

@ -251,11 +251,11 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> SearchMarkPoint::GetSymbolNames
auto symbolZoomInfo = make_unique_dp<SymbolNameZoomInfo>();
if (IsBookingSpecialMark())
{
if (m_isPreparing)
if (!m_isAvailable)
{
symbolZoomInfo->emplace(kWorldZoomLevel, symbolName);
}
else if (!m_isAvailable)
else if (m_isPreparing)
{
symbolZoomInfo->emplace(kWorldZoomLevel, symbolName);
}
@ -289,17 +289,7 @@ drape_ptr<df::UserPointMark::BageInfo> SearchMarkPoint::GetBadgeInfo() const
if (IsBookingSpecialMark())
{
if (m_isPreparing)
{
if (m_isSelected)
{
auto badgeInfo = make_unique_dp<BageInfo>();
badgeInfo->m_maskColor = badgeMaskColor;
badgeInfo->m_zoomInfo.emplace(kWorldZoomLevel, badgeName);
return badgeInfo;
}
}
else if (!m_isAvailable)
if (!m_isAvailable)
{
if (HasReason() && m_isSelected)
{
@ -314,6 +304,16 @@ drape_ptr<df::UserPointMark::BageInfo> SearchMarkPoint::GetBadgeInfo() const
return badgeInfo;
}
}
else if (m_isPreparing)
{
if (m_isSelected)
{
auto badgeInfo = make_unique_dp<BageInfo>();
badgeInfo->m_maskColor = badgeMaskColor;
badgeInfo->m_zoomInfo.emplace(kWorldZoomLevel, badgeName);
return badgeInfo;
}
}
else if (HasPrice() || HasPricing() || m_isSelected)
{
auto badgeInfo = make_unique_dp<BageInfo>();
@ -385,10 +385,10 @@ df::ColorConstant SearchMarkPoint::GetColorConstant() const
{
if (IsBookingSpecialMark())
{
if (m_isPreparing)
return "SearchmarkPreparing";
if (!m_isAvailable)
return m_isSelected ? "SearchmarkSelectedNotAvailable" : "SearchmarkNotAvailable";
if (m_isPreparing)
return "SearchmarkPreparing";
if (m_hasLocalAds)
return "RatingGood";
if (!HasRating())
@ -412,11 +412,7 @@ drape_ptr<df::UserPointMark::TitlesInfo> SearchMarkPoint::GetTitleDecl() const
float const fontSize = static_cast<float>(kFontSize / fs);
if (IsBookingSpecialMark())
{
if (m_isPreparing)
{
/* do nothing */;
}
else if (!m_isAvailable)
if (!m_isAvailable)
{
if (HasReason() && m_isSelected)
{
@ -433,6 +429,10 @@ drape_ptr<df::UserPointMark::TitlesInfo> SearchMarkPoint::GetTitleDecl() const
reasonTitleDecl.m_primaryText = m_reason;
}
}
else if (m_isPreparing)
{
/* do nothing */;
}
else
{
titles = make_unique_dp<TitlesInfo>();
@ -491,15 +491,15 @@ int SearchMarkPoint::GetMinTitleZoom() const
{
if (IsBookingSpecialMark())
{
if (m_isPreparing)
{
return kWorldZoomLevel;
}
else if (!m_isAvailable)
if (!m_isAvailable)
{
if (HasReason() && m_isSelected)
return kWorldZoomLevel;
}
else if (m_isPreparing)
{
return kWorldZoomLevel;
}
else
{
if (HasGoodRating())
@ -625,9 +625,9 @@ std::string SearchMarkPoint::GetSymbolName() const
{
if (IsBookingSpecialMark())
{
if (m_isPreparing)
if (!m_isAvailable)
symbolName = kColoredmarkSmall;
else if (!m_isAvailable)
else if (m_isPreparing)
symbolName = kColoredmarkSmall;
else
symbolName = GetSymbol(m_type, m_hasLocalAds, HasRating());
@ -652,16 +652,16 @@ std::string SearchMarkPoint::GetBadgeName() const
if (IsBookingSpecialMark())
{
if (m_isPreparing)
{
if (m_isSelected)
badgeName = kSelectionChipSmall;
}
else if (!m_isAvailable)
if (!m_isAvailable)
{
if (HasReason() && m_isSelected)
badgeName = kSmallSelectedChip;
}
else if (m_isPreparing)
{
if (m_isSelected)
badgeName = kSelectionChipSmall;
}
else
{
if (m_isSelected)