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

inserting line break when the display name of the country is too long.

Browse source
This commit is contained in:
rachytski 2012-06-05 12:34:07 +04:00 • committed by Alex Zolotarev
parent 71507273ae
commit 1bd70241ca
2 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
map/country_status_display.cpp
View file

@ -9,12 +9,23 @@
#include "../yg/overlay_renderer.hpp"
string const CountryStatusDisplay::displayName() const
{
if (!m_mapGroupName.empty())
return m_mapName + "(" + m_mapGroupName + ")";
else
return m_mapName;
}
void CountryStatusDisplay::cache()
{
m_downloadButton->setIsVisible(false);
m_statusMsg->setIsVisible(false);
string const dn = displayName();
strings::UniString s(strings::MakeUniString(dn));
if (m_countryIdx != storage::TIndex())
{
switch (m_countryStatus)
@ -24,12 +35,11 @@ void CountryStatusDisplay::cache()
m_statusMsg->setIsVisible(true);
ostringstream out;
out << m_mapName;
if (!m_mapGroupName.empty())
out << "(" << m_mapGroupName << ")";
out << " is added to the\ndownloading queue";
if (s.size() > 13)
out << dn << "\nis added to the\ndownloading queue";
else
out << dn << " is added to the\ndownloading queue";
m_statusMsg->setText(out.str());
}
@ -41,10 +51,10 @@ void CountryStatusDisplay::cache()
ostringstream out;
out << "Downloading " << m_mapName;
if (!m_mapGroupName.empty())
out << "(" << m_mapGroupName << ")";
if (s.size() > 13)
out << "Downloading\n" << dn;
else
out << "Downloading " << dn;
out << "(" << m_countryProgress.first * 100 / m_countryProgress.second << "%)";
@ -55,11 +65,10 @@ void CountryStatusDisplay::cache()
{
m_downloadButton->setIsVisible(true);
string buttonText = "Download " + m_mapName;
if (!m_mapGroupName.empty())
buttonText += "(" + m_mapGroupName + ")";
m_downloadButton->setText(buttonText);
if (s.size() > 13)
m_downloadButton->setText("Download\n" + dn);
else
m_downloadButton->setText("Download " + dn);
}
break;
case storage::EDownloadFailed:
@ -69,10 +78,10 @@ void CountryStatusDisplay::cache()
ostringstream out;
out << "Downloading " << m_mapName;
if (!m_mapGroupName.empty())
out << "(" << m_mapGroupName << ")";
if (s.size() > 13)
out << "Downloading\n" << dn;
else
out << "Downloading " << dn;
out << "\nhas failed.";

2
map/country_status_display.hpp
View file

@ -48,6 +48,8 @@ private:
/// caching resources for fast rendering.
void cache();
string const displayName() const;
public:
struct Params : public gui::Element::Params