kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] [bookmarks] Fix bug with creation of balloon's image.

Browse source
This commit is contained in:
vng 2013-02-13 18:55:55 +03:00 • committed by Alex Zolotarev
parent e0c7ce9551
commit 7db377947d
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -53,10 +53,16 @@ namespace android
m_bmCategory = m_work.GetStringsBundle().GetString("my_places");
m_bmType = "placemark-red";
for (size_t i = 0; i < ARRAY_SIZE(m_images); ++i)
m_images[i] = 0;
}
Framework::~Framework()
{
for (size_t i = 0; i < ARRAY_SIZE(m_images); ++i)
delete m_images[i];
delete m_videoTimer;
}
@ -155,6 +161,10 @@ namespace android
return false;
}
graphics::EDensity const density = m_work.GetRenderPolicy()->Density();
m_images[IMAGE_PLUS] = new ImageT("plus.png", density);
m_images[IMAGE_ARROW] = new ImageT("right-arrow.png", density);
m_work.SetUpdatesEnabled(true);
m_work.EnterForeground();
return true;
@ -566,7 +576,7 @@ namespace android
if (ValidateBookmarkAndCategory(bac))
{
Bookmark const * pBM = m_work.GetBmCategory(bac.first)->GetBookmark(bac.second);
ActivatePopup(pBM->GetOrg(), pBM->GetName(), "right-arrow.png");
ActivatePopup(pBM->GetOrg(), pBM->GetName(), IMAGE_ARROW);
return true;
}
else
@ -597,18 +607,18 @@ namespace android
if (name.empty())
name = m_work.GetStringsBundle().GetString("dropped_pin");
ActivatePopup(pos, name, "plus.png");
ActivatePopup(pos, name, IMAGE_PLUS);
m_work.DrawPlacemark(pos);
m_work.Invalidate();
}
void Framework::ActivatePopup(m2::PointD const & pos, string const & name, string const & imageName)
void Framework::ActivatePopup(m2::PointD const & pos, string const & name, PopupImageIndexT index)
{
BookmarkBalloon * b = GetBookmarkBalloon();
m_work.DisablePlacemark();
b->setImage(graphics::Image::Info(imageName.c_str(), m_work.GetRenderPolicy()->Density()));
b->setImage(*m_images[index]);
b->setGlbPivot(pos);
b->setBookmarkName(name);
b->setIsVisible(true);

7
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -60,7 +60,12 @@ namespace android
bool HandleOnSmthClick(double x, double y);
bool AdditionalHandlingForLongClick(double x, double y);
void ActivatePopup(m2::PointD const & pos, string const & name, string const & imageName);
typedef graphics::Image::Info ImageT;
ImageT * m_images[2];
enum PopupImageIndexT { IMAGE_PLUS = 0, IMAGE_ARROW = 1 };
void ActivatePopup(m2::PointD const & pos, string const & name, PopupImageIndexT index);
void ActivatePopupWithAddressInfo(m2::PointD const & pos, ::Framework::AddressInfo const & addrInfo);
static inline bool ValidateBookmarkAndCategory(BookmarkAndCategory const & bac)