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

[android] Changed compass arrow look

Browse source
This commit is contained in:
Alex Zolotarev 2012-10-24 16:47:41 +03:00 • committed by Alex Zolotarev
parent f39b440fcc
commit 2848a6d0c0
3 changed files with 37 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
map/compass_arrow.cpp
View file

@ -15,14 +15,16 @@
CompassArrow::CompassArrow(Params const & p)
: base_t(p),
m_boundRects(1)
m_arrowWidth(p.m_arrowWidth),
m_arrowHeight(p.m_arrowHeight),
m_northLeftColor(0xcc, 0x33, 0x00, 0xcc),
m_northRightColor(0xff, 0x33, 0x00, 0xcc),
m_southLeftColor(0xcc, 0xcc, 0xcc, 0xcc),
m_southRightColor(0xff, 0xff, 0xff, 0xcc),
m_angle(0),
m_boundRects(1),
m_framework(p.m_framework)
{
m_arrowWidth = p.m_arrowWidth;
m_arrowHeight = p.m_arrowHeight;
m_northColor = p.m_northColor;
m_southColor = p.m_southColor;
m_framework = p.m_framework;
m_angle = 0;
}
void CompassArrow::SetAngle(double angle)
@ -77,26 +79,38 @@ void CompassArrow::cache()
cacheScreen->beginFrame();
cacheScreen->setDisplayList(m_displayList.get());
double k = visualScale();
double const k = visualScale();
double halfW = m_arrowWidth / 2.0 * k;
double halfH = m_arrowHeight / 2.0 * k;
double const halfW = m_arrowWidth / 2.0 * k;
double const halfH = m_arrowHeight / 2.0 * k;
m2::PointF northPts[3] = {
m2::PointF const northLeftPts[3] = {
m2::PointF(-halfW, 0),
m2::PointF(0, -halfH),
m2::PointF(0, 0)
};
cacheScreen->drawConvexPolygon(northLeftPts, 3, m_northLeftColor, depth());
m2::PointF const northRightPts[3] = {
m2::PointF(0, 0),
m2::PointF(0, -halfH),
m2::PointF(halfW, 0)
};
cacheScreen->drawConvexPolygon(northRightPts, 3, m_northRightColor, depth());
cacheScreen->drawConvexPolygon(northPts, 3, m_northColor, depth());
m2::PointF southPts[3] = {
m2::PointF const southLeftPts[3] = {
m2::PointF(-halfW, 0),
m2::PointF(0, 0),
m2::PointF(0, halfH),
};
cacheScreen->drawConvexPolygon(southLeftPts, 3, m_southLeftColor, depth());
m2::PointF const southRightPts[3] = {
m2::PointF(0, 0),
m2::PointF(halfW, 0),
m2::PointF(0, halfH),
};
cacheScreen->drawConvexPolygon(southPts, 3, m_southColor, depth());
cacheScreen->drawConvexPolygon(southRightPts, 3, m_southRightColor, depth());
m2::PointD outlinePts[6] = {
m2::PointD(-halfW, 0),
@ -107,7 +121,7 @@ void CompassArrow::cache()
m2::PointD(halfW, 0)
};
yg::PenInfo outlinePenInfo(yg::Color(32, 32, 32, 255), 1, 0, 0, 0);
yg::PenInfo const outlinePenInfo(yg::Color(0x66, 0x66, 0x66, 0xcc), 1, 0, 0, 0);
cacheScreen->drawPath(outlinePts, sizeof(outlinePts) / sizeof(m2::PointD), 0, cacheScreen->skin()->mapPenInfo(outlinePenInfo), depth());

8
map/compass_arrow.hpp
View file

@ -21,8 +21,10 @@ private:
unsigned m_arrowWidth;
unsigned m_arrowHeight;
yg::Color m_northColor;
yg::Color m_southColor;
yg::Color const m_northLeftColor;
yg::Color const m_northRightColor;
yg::Color const m_southLeftColor;
yg::Color const m_southRightColor;
double m_angle;
scoped_ptr<yg::gl::DisplayList> m_displayList;
@ -40,8 +42,6 @@ public:
{
unsigned m_arrowWidth;
unsigned m_arrowHeight;
yg::Color m_northColor;
yg::Color m_southColor;
Framework * m_framework;
};

6
map/information_display.cpp
View file

@ -55,11 +55,9 @@ InformationDisplay::InformationDisplay(Framework * framework)
cap.m_position = yg::EPosCenter;
cap.m_depth = yg::maxDepth;
cap.m_arrowHeight = 60;
cap.m_arrowWidth = 20;
cap.m_arrowHeight = 50;
cap.m_arrowWidth = 16;
cap.m_pivot = m2::PointD(0, 0);
cap.m_northColor = yg::Color(255, 0, 0, 255);
cap.m_southColor = yg::Color(255, 255, 255, 255);
cap.m_framework = framework;
m_compassArrow.reset(new CompassArrow(cap));