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

minor fixes for text_renderer debugging.

Browse source
This commit is contained in:
rachytski 2011-03-24 22:10:07 +02:00 • committed by Alex Zolotarev
parent b9babddc3e
commit 22e7db9163
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
yg/text_renderer.cpp
View file

@ -65,6 +65,21 @@ namespace yg
m_needRedraw = flag;
}
bool TextRenderer::TextObj::IsNeedRedraw() const
{
return m_needRedraw;
}
bool TextRenderer::TextObj::IsFrozen() const
{
return m_frozen;
}
string const & TextRenderer::TextObj::Text() const
{
return m_utf8Text;
}
void TextRenderer::TextObj::Offset(m2::PointD const & offs)
{
m_pt += offs;
@ -76,6 +91,8 @@ namespace yg
// because frozen texts shouldn't be popped out by newly arrived texts.
if (r2.m_frozen)
return false;
if (r1.m_size != r2.m_size)
return r1.m_size > r2.m_size;
return (r1.m_depth > r2.m_depth);
}

7
yg/text_renderer.hpp
View file

@ -19,8 +19,6 @@ namespace yg
enum TextPos { under_line, middle_line, above_line };
private:
class TextObj
{
m2::PointD m_pt;
@ -41,11 +39,16 @@ namespace yg
void Draw(TextRenderer * pTextRenderer) const;
m2::RectD const GetLimitRect(TextRenderer * pTextRenderer) const;
void SetNeedRedraw(bool needRedraw) const;
bool IsNeedRedraw() const;
bool IsFrozen() const;
void Offset(m2::PointD const & pt);
string const & Text() const;
static bool better_text(TextObj const & r1, TextObj const & r2);
};
private:
m4::Tree<TextObj> m_tree;
void checkTextRedraw();