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

fixed bug with offsetting TextElements.

Browse source
This commit is contained in:
rachytski 2012-06-01 13:34:24 +04:00 • committed by Alex Zolotarev
parent 50dfd74e0b
commit 2f5ce9c786
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
yg/path_text_element.cpp
View file

@ -77,10 +77,10 @@ namespace yg
drawTextImpl(m_glyphLayout, screen, m, false, desc, yg::maxDepth);
}
void PathTextElement::offset(m2::PointD const & offs)
void PathTextElement::setPivot(m2::PointD const & pivot)
{
TextElement::offset(offs);
m_glyphLayout.setPivot(pivot());
TextElement::setPivot(pivot);
m_glyphLayout.setPivot(pivot);
}
int PathTextElement::visualRank() const

2
yg/path_text_element.hpp
View file

@ -29,7 +29,7 @@ namespace yg
int visualRank() const;
void offset(m2::PointD const & offs);
void setPivot(m2::PointD const & pivot);
OverlayElement * clone(math::Matrix<double, 3, 3> const & m) const;
};

7
yg/straight_text_element.cpp
View file

@ -282,9 +282,12 @@ namespace yg
}
}
void StraightTextElement::offset(m2::PointD const & offs)
void StraightTextElement::setPivot(m2::PointD const & pv)
{
TextElement::offset(offs);
m2::PointD oldPv = pivot();
m2::PointD offs = pv - oldPv;
TextElement::setPivot(pv);
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
m_glyphLayouts[i].setPivot(m_glyphLayouts[i].pivot() + offs);

2
yg/straight_text_element.hpp
View file

@ -35,7 +35,7 @@ namespace yg
int visualRank() const;
void offset(m2::PointD const & offs);
void setPivot(m2::PointD const & pv);
OverlayElement * clone(math::Matrix<double, 3, 3> const & m) const;
};