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

after review fixes

Browse source
This commit is contained in:
ExMix 2013-05-31 17:30:45 +03:00 • committed by Alex Zolotarev
parent 4a1a41715d
commit c9324a88ab
7 changed files with 95 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -595,7 +595,7 @@ namespace android
case ::Framework::BOOKMARK:
{
Bookmark const * pBM = m_work.GetBmCategory(bmAndCat.first)->GetBookmark(bmAndCat.second);
ActivatePopup(pBM->GetOrg(), pBM->GetName(), string(""), IMAGE_ARROW);
ActivatePopup(pBM->GetOrg(), pBM->GetName(), "", IMAGE_ARROW);
return;
}
case ::Framework::POI:

17
graphics/glyph_layout.cpp
View file

@ -224,7 +224,7 @@ namespace graphics
bool isFirst = true;
strings::UniChar dotSymbol = strings::MakeUniString(".")[0];
strings::UniChar dotSymbol = '.';
GlyphKey dotKey(dotSymbol,
fontDesc.m_size,
false,
@ -253,21 +253,24 @@ namespace graphics
boundRect.Inflate(2, 2);
m2::PointD ptOffs(-boundRect.SizeX() / 2 - boundRect.minX(),
-boundRect.SizeY() / 2 - boundRect.minY());
double halfSizeX = boundRect.SizeX() / 2.0;
double halfSizeY = boundRect.SizeY() / 2.0;
m2::PointD ptOffs(-halfSizeX - boundRect.minX(),
-halfSizeY - boundRect.minY());
// adjusting according to position
if (pos & EPosLeft)
ptOffs += m2::PointD(-boundRect.SizeX() / 2, 0);
ptOffs += m2::PointD(-halfSizeX, 0);
if (pos & EPosRight)
ptOffs += m2::PointD(boundRect.SizeX() / 2, 0);
ptOffs += m2::PointD(halfSizeX, 0);
if (pos & EPosAbove)
ptOffs += m2::PointD(0, -boundRect.SizeY() / 2);
ptOffs += m2::PointD(0, -halfSizeY);
if (pos & EPosUnder)
ptOffs += m2::PointD(0, boundRect.SizeY() / 2);
ptOffs += m2::PointD(0, halfSizeY);
for (unsigned i = 0; i < m_entries.size(); ++i)
m_entries[i].m_pt += ptOffs;

125
gui/balloon.cpp
View file

@ -8,14 +8,17 @@
#include "../graphics/screen.hpp"
#include "../graphics/path.hpp"
#define TOP_SHADOW_MARGIN 2
#define BOTTOM_SHADOW_MARGIN 4
#define TEXT_LEFT_MARGIN 1
#define TEXT_RIGHT_MARGIN 25
#define ARROW_MARGIN 16
namespace gui
{
namespace
{
static const int TopShadowMargin = 2;
static const int BottomShadowMargin = 4;
static const int LeftTextMargin = 1;
static const int RightTextMargin = 25;
static const int ArrowMargin = 16;
}
Balloon::Params::Params()
: m_image()
{}
@ -76,11 +79,11 @@ namespace gui
double k = visualScale();
tr.setMinX(tr.minX() - (m_borderLImg.m_size.x + TEXT_LEFT_MARGIN * k));
tr.setMaxX(tr.maxX() + TEXT_RIGHT_MARGIN * k);
tr.setMinX(tr.minX() - (m_borderLImg.m_size.x + LeftTextMargin * k));
tr.setMaxX(tr.maxX() + RightTextMargin * k);
auxTr.setMinX(auxTr.minX() - (m_borderLImg.m_size.x + TEXT_LEFT_MARGIN * k));
auxTr.setMaxX(auxTr.maxX() + TEXT_RIGHT_MARGIN * k);
auxTr.setMinX(auxTr.minX() - (m_borderLImg.m_size.x + LeftTextMargin * k));
auxTr.setMaxX(auxTr.maxX() + RightTextMargin * k);
ir.setMaxX(ir.maxX() + m_borderRImg.m_size.x);
@ -115,8 +118,8 @@ namespace gui
m2::RectD imageRect = m_imageView->roughBoundRect();
double k = visualScale();
double leftMargin = m_borderLImg.m_size.x + TEXT_LEFT_MARGIN * k;
double rightMargin = TEXT_RIGHT_MARGIN * k;
double leftMargin = m_borderLImg.m_size.x + LeftTextMargin * k;
double rightMargin = RightTextMargin * k;
double imageMargin = m_borderRImg.m_size.x;
@ -137,9 +140,9 @@ namespace gui
graphics::EPosition pos = position();
graphics::EPosition newPosition = graphics::EPosLeft;
if (pos & graphics::EPosRight)
pv.x = pv.x + m_arrowImg.m_size.x / 2.0 + ARROW_MARGIN * k + m_borderRImg.m_size.x - imageMargin;
pv.x = pv.x + m_arrowImg.m_size.x / 2.0 + ArrowMargin * k + m_borderRImg.m_size.x - imageMargin;
else if (pos & graphics::EPosLeft)
pv.x = pv.x + (maxWidth - m_borderRImg.m_size.x - ARROW_MARGIN * k - m_arrowImg.m_size.x / 2.0) - imageMargin;
pv.x = pv.x + (maxWidth - m_borderRImg.m_size.x - ArrowMargin * k - m_arrowImg.m_size.x / 2.0) - imageMargin;
else
{
if (m_textMode != NoText)
@ -147,36 +150,50 @@ namespace gui
else
newPosition = graphics::EPosCenter;
}
pv.y -= (m_arrowImg.m_size.y + (m_bodyImg.m_size.y - (TOP_SHADOW_MARGIN + BOTTOM_SHADOW_MARGIN) * k) / 2.0);
pv.y -= (m_arrowImg.m_size.y + (m_bodyImg.m_size.y - (TopShadowMargin + BottomShadowMargin) * k) / 2.0);
m_imageView->setPivot(pv);
m_imageView->setPosition(newPosition);
}
void Balloon::layoutPointByX(m2::PointD & pv,
double balloonWidth,
double leftMargin)
{
double k = visualScale();
graphics::EPosition pos = position();
if (pos & graphics::EPosRight)
pv.x = pv.x - (balloonWidth - m_borderRImg.m_size.x - ArrowMargin * k - m_arrowImg.m_size.x / 2.0) + leftMargin;
else if (pos & graphics::EPosLeft)
pv.x = pv.x - (m_borderLImg.m_size.x + ArrowMargin * k + m_arrowImg.m_size.x / 2.0) + leftMargin;
else
pv.x = pv.x - balloonWidth / 2.0 + leftMargin;
}
graphics::EPosition Balloon::layoutPointByY(m2::PointD & pv,
double dualDivisor)
{
graphics::EPosition result = graphics::EPosRight;
double heightWithoutShadows = m_bodyImg.m_size.y - (TopShadowMargin + BottomShadowMargin) * visualScale();
if (m_textMode == DualText)
{
pv.y = pv.y - (heightWithoutShadows / dualDivisor + m_arrowImg.m_size.y);
result = graphics::EPosAboveRight;
}
else
pv.y = pv.y - (heightWithoutShadows / 2.0 + m_arrowImg.m_size.y);
return result;
}
void Balloon::layoutMainText(double balloonWidth,
double leftMargin)
{
m2::PointD pv = pivot();
graphics::EPosition newPosition = graphics::EPosRight;
graphics::EPosition balloonPos = position();
double k = visualScale();
if (balloonPos & graphics::EPosRight)
pv.x = pv.x - (balloonWidth - m_borderRImg.m_size.x - ARROW_MARGIN * k - m_arrowImg.m_size.x / 2.0) + leftMargin;
else if (balloonPos & graphics::EPosLeft)
pv.x = pv.x - (m_borderLImg.m_size.x + ARROW_MARGIN * k + m_arrowImg.m_size.x / 2.0) + leftMargin;
else
pv.x = pv.x - balloonWidth / 2.0 + leftMargin;
double heightWithoutShadows = m_bodyImg.m_size.y - (BOTTOM_SHADOW_MARGIN + TOP_SHADOW_MARGIN) * visualScale();
if (m_textMode == DualText)
{
pv.y = pv.y - (heightWithoutShadows / 2.0 + m_arrowImg.m_size.y);
newPosition = graphics::EPosAboveRight;
}
else
pv.y = pv.y - (heightWithoutShadows / 2.0 + m_arrowImg.m_size.y);
layoutPointByX(pv, balloonWidth, leftMargin);
graphics::EPosition newPosition = layoutPointByY(pv, 2.0);
m_mainTextView->setPivot(pv);
m_mainTextView->setPosition(newPosition);
@ -186,25 +203,9 @@ namespace gui
double leftMargin)
{
m2::PointD pv = pivot();
graphics::EPosition newPosition = graphics::EPosRight;
double k = visualScale();
graphics::EPosition balloonPos = position();
if (balloonPos & graphics::EPosRight)
pv.x = pv.x - (balloonWidth - m_borderRImg.m_size.x - ARROW_MARGIN * k - m_arrowImg.m_size.x / 2.0) + leftMargin;
else if (balloonPos & graphics::EPosLeft)
pv.x = pv.x - (m_borderLImg.m_size.x + ARROW_MARGIN * visualScale() + m_arrowImg.m_size.x / 2.0) + leftMargin;
else
pv.x = pv.x - balloonWidth / 2.0 + leftMargin;
double heightWithoutShadows = m_bodyImg.m_size.y - (BOTTOM_SHADOW_MARGIN + TOP_SHADOW_MARGIN) * visualScale();
if (m_textMode == DualText)
{
pv.y = pv.y - (heightWithoutShadows / 6.0 + m_arrowImg.m_size.y);
newPosition = graphics::EPosAboveRight;
}
else
pv.y = pv.y - (heightWithoutShadows / 2.0 + m_arrowImg.m_size.y);
layoutPointByX(pv, balloonWidth, leftMargin);
graphics::EPosition newPosition = layoutPointByY(pv, 6.0);
m_auxTextView->setPivot(pv);
m_auxTextView->setPosition(newPosition);
@ -221,7 +222,7 @@ namespace gui
{
uint32_t borderID = cs->mapInfo(m_borderLImg);
double offsetY = m_borderLImg.m_size.y + m_arrowImg.m_size.y - BOTTOM_SHADOW_MARGIN * visualScale();
double offsetY = m_borderLImg.m_size.y + m_arrowImg.m_size.y - BottomShadowMargin * visualScale();
math::Matrix<double, 3, 3> m = math::Shift(
math::Identity<double, 3>(),
-offsetX, -offsetY);
@ -234,7 +235,7 @@ namespace gui
{
uint32_t borderID = cs->mapInfo(m_borderRImg);
double offsetY = m_borderRImg.m_size.y + m_arrowImg.m_size.y - BOTTOM_SHADOW_MARGIN * visualScale();
double offsetY = m_borderRImg.m_size.y + m_arrowImg.m_size.y - BottomShadowMargin * visualScale();
math::Matrix<double, 3, 3> m = math::Shift(
math::Identity<double, 3>(),
offsetX - m_borderRImg.m_size.x, -offsetY);
@ -248,7 +249,7 @@ namespace gui
{
uint32_t bodyID = cs->mapInfo(m_bodyImg);
int32_t bodyCount = (bodyWidth + m_bodyImg.m_size.x - 1) / (double)(m_bodyImg.m_size.x );
double offsetY = m_bodyImg.m_size.y + m_arrowImg.m_size.y - BOTTOM_SHADOW_MARGIN * visualScale();
double offsetY = m_bodyImg.m_size.y + m_arrowImg.m_size.y - BottomShadowMargin * visualScale();
offsetY = -offsetY;
double currentOffsetX = -offsetX;
@ -298,12 +299,12 @@ namespace gui
graphics::EPosition pos = position();
if (pos & graphics::EPosRight)
{
rightBorderOffset = m_borderLImg.m_size.x + ARROW_MARGIN * visualScale() + m_arrowImg.m_size.x / 2.0;
rightBorderOffset = m_borderLImg.m_size.x + ArrowMargin * visualScale() + m_arrowImg.m_size.x / 2.0;
leftBorderOffset = bw - rightBorderOffset;
}
else if (pos & graphics::EPosLeft)
{
leftBorderOffset = m_borderRImg.m_size.x + ARROW_MARGIN * visualScale() + m_arrowImg.m_size.x / 2.0;
leftBorderOffset = m_borderRImg.m_size.x + ArrowMargin * visualScale() + m_arrowImg.m_size.x / 2.0;
rightBorderOffset = bw - leftBorderOffset;
}
else
@ -328,10 +329,10 @@ namespace gui
void Balloon::initBgImages()
{
graphics::EDensity density = m_controller->GetDensity();
m_borderLImg = graphics::Image::Info("round-left.png", density /*, graphics::Image::Info::DitherIt()*/);
m_borderRImg = graphics::Image::Info("round-right.png", density /*, graphics::Image::Info::DitherIt()*/);
m_bodyImg = graphics::Image::Info("mid.png", density /*, graphics::Image::Info::DitherIt()*/);
m_arrowImg = graphics::Image::Info("pin.png", density /*, graphics::Image::Info::DitherIt()*/);
m_borderLImg = graphics::Image::Info("round-left.png", density);
m_borderRImg = graphics::Image::Info("round-right.png", density);
m_bodyImg = graphics::Image::Info("mid.png", density);
m_arrowImg = graphics::Image::Info("pin.png", density);
}
void Balloon::setController(Controller * controller)
@ -434,8 +435,8 @@ namespace gui
void Balloon::calcMaxTextWidth()
{
double k = visualScale();
double textMargin = m_borderLImg.m_size.x + TEXT_LEFT_MARGIN * k +
TEXT_RIGHT_MARGIN * k;
double textMargin = m_borderLImg.m_size.x + LeftTextMargin * k +
RightTextMargin * k;
double imageWidth = m_borderRImg.m_size.x;
unsigned maxTextWidth = ceil(m_maxWidth - (textMargin + imageWidth));

7
gui/balloon.hpp
View file

@ -70,6 +70,13 @@ namespace gui
void layoutAuxText(double balloonWidth,
double leftMargin);
void layoutPointByX(m2::PointD & pv,
double balloonWidth,
double leftMargin);
graphics::EPosition layoutPointByY(m2::PointD & pv,
double dualDivisor);
void calcMaxTextWidth();
graphics::Image::Info m_borderLImg;

5
gui/gui_tests/gui_tests.cpp
View file

@ -25,6 +25,7 @@ struct BalloonTest
bp.m_position = graphics::EPosAbove;
bp.m_mainText = "Active";
bp.m_auxText = "Very very very very very very very very very very very very very very long";
bp.m_image = graphics::Image::Info("plus.png", graphics::EDensityMDPI);
m_balloon.reset(new gui::Balloon(bp));
@ -47,9 +48,9 @@ struct BalloonTest
void SetText(gui::Balloon * b)
{
if (m_flag)
b->setText("Arrow", "");
b->setText("Arrow", "Very very very very very very very very very very very very very very long");
else
b->setText("Cinema", "");
b->setText("Very very very very very very very very very very very very very very long", "Arrow");
}
void DoDraw(shared_ptr<graphics::Screen> const & p)

5
map/address_finder.cpp
View file

@ -576,10 +576,7 @@ string Framework::AddressInfo::GetPinName() const
string Framework::AddressInfo::GetPinType() const
{
char const * type = GetBestType();
if (type)
return string(type);
return "";
return (type ? type : "");
}
string Framework::AddressInfo::FormatPinText() const

33
map/bookmark_balloon.cpp
View file

@ -6,8 +6,11 @@
#include "../anim/controller.hpp"
#include "../anim/value_interpolation.hpp"
#define POPUP_PADDING 23
#define ANIM_PADDING 8
namespace
{
static const int PopupPadding = 23;
static const int AnimPadding = 8;
}
class BookmarkBalloon::BalloonAnimTask : public anim::Task
{
@ -135,23 +138,23 @@ bool BookmarkBalloon::checkPosition()
balloonRect = roughBoundRect();
if (balloonRect.minX() < 0)
{
pixelOrg.x += (balloonRect.minX() - ANIM_PADDING * k);
pixelOrg.x += (balloonRect.minX() - AnimPadding * k);
result = true;
}
else if (balloonRect.maxX() > screen.GetWidth())
{
pixelOrg.x += (balloonRect.maxX() - screen.GetWidth() + ANIM_PADDING * k);
pixelOrg.x += (balloonRect.maxX() - screen.GetWidth() + AnimPadding * k);
result = true;
}
if (balloonRect.minY() < 0)
{
pixelOrg.y += (balloonRect.minY() - ANIM_PADDING * k);
pixelOrg.y += (balloonRect.minY() - AnimPadding * k);
result = true;
}
else if (balloonRect.maxY() > screen.GetHeight())
{
pixelOrg.y += (balloonRect.maxY() - screen.GetHeight() + ANIM_PADDING * k);
pixelOrg.y += (balloonRect.maxY() - screen.GetHeight() + AnimPadding * k);
result = true;
}
@ -166,7 +169,7 @@ void BookmarkBalloon::update()
if (isVisible())
{
m2::PointD newPivot(m_framework->GtoP(m_glbPivot));
newPivot.y -= POPUP_PADDING * visualScale();
newPivot.y -= PopupPadding * visualScale();
setPivot(newPivot);
if (checkPosition())
@ -257,22 +260,6 @@ void BookmarkBalloon::setBookmarkCaption(string const & name,
m_bmkName = name;
m_bmkType = type;
/*strings::UniString uniName = strings::MakeUniString(name);
strings::UniString uniType = strings::MakeUniString(type);
// 15 is going from straight_text_element.cpp, visSplit.
if (uniName.size() > 15)
{
uniName.resize(18);
uniName[17] = uniName[16] = uniName[15] = '.';
}
if (uniType.size() > 15)
{
uniType.resize(18);
uniType[17] = uniType[16] = uniType[15] = '.';
}*/
setText(name, type);
}