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

[guides on map][drape] Increase touch area for guides marks.

Browse source
This commit is contained in:
Daria Volvenkova 2020-06-24 12:06:46 +03:00 • committed by Vladimir Byko-Ianko
parent 0d0bc3ea77
commit 9d7ebe6f67
4 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drape_frontend/frontend_renderer.cpp
View file

@ -2705,6 +2705,18 @@ m2::AnyRectD TapInfo::GetRoutingPointSearchRect(m2::PointD const & mercator, Scr
return result;
}
// static
m2::AnyRectD TapInfo::GetGuideSearchRect(m2::PointD const & mercator, ScreenBase const & screen)
{
static int constexpr kGuideTouchPixelIncrease = 20;
m2::AnyRectD result;
double const sizeExt = kGuideTouchPixelIncrease * VisualParams::Instance().GetVisualScale();
double const halfSize = VisualParams::Instance().GetTouchRectRadius();
screen.GetTouchRect(screen.GtoP(mercator), halfSize + sizeExt, result);
return result;
}
// static
m2::AnyRectD TapInfo::GetPreciseSearchRect(m2::PointD const & mercator, double const eps)
{

1
drape_frontend/frontend_renderer.hpp
View file

@ -67,6 +67,7 @@ struct TapInfo
static m2::AnyRectD GetDefaultSearchRect(m2::PointD const & mercator, ScreenBase const & screen);
static m2::AnyRectD GetBookmarkSearchRect(m2::PointD const & mercator, ScreenBase const & screen);
static m2::AnyRectD GetRoutingPointSearchRect(m2::PointD const & mercator, ScreenBase const & screen);
static m2::AnyRectD GetGuideSearchRect(m2::PointD const & mercator, ScreenBase const & screen);
static m2::AnyRectD GetPreciseSearchRect(m2::PointD const & mercator, double const eps);
};

6
map/bookmark_manager.cpp
View file

@ -2740,10 +2740,12 @@ UserMark const * BookmarkManager::FindNearestUserMark(TTouchRectHolder const & h
BestUserMarkFinder finder(holder, findOnlyVisible, this);
auto hasFound = finder(UserMark::Type::ROUTING) ||
finder(UserMark::Type::ROAD_WARNING) ||
finder(UserMark::Type::GUIDE) ||
finder(UserMark::Type::GUIDE_CLUSTER) ||
finder(UserMark::Type::SEARCH) ||
finder(UserMark::Type::API);
hasFound = finder(UserMark::Type::GUIDE) || hasFound;
hasFound = finder(UserMark::Type::GUIDE_CLUSTER) || hasFound;
if (!hasFound)
{
for (auto const & pair : m_categories)

3
map/framework.cpp
View file

@ -2844,6 +2844,9 @@ UserMark const * Framework::FindUserMarkInTapPosition(place_page::BuildInfo cons
if (type == UserMark::Type::ROUTING || type == UserMark::Type::ROAD_WARNING)
return df::TapInfo::GetRoutingPointSearchRect(buildInfo.m_mercator, m_currentModelView);
if (type == UserMark::Type::GUIDE || type == UserMark::Type::GUIDE_CLUSTER)
return df::TapInfo::GetGuideSearchRect(buildInfo.m_mercator, m_currentModelView);
return df::TapInfo::GetDefaultSearchRect(buildInfo.m_mercator, m_currentModelView);
},
[](UserMark::Type type)