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

added "invalid" flag to OverlayElement.

Browse source
This commit is contained in:
rachytski 2012-05-28 21:56:32 +04:00 • committed by Alex Zolotarev
parent 8206f5e295
commit bbd65612ef
4 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
yg/overlay.cpp
View file

@ -259,10 +259,13 @@ namespace yg
void Overlay::processOverlayElement(shared_ptr<OverlayElement> const & oe)
{
if (m_couldOverlap)
addOverlayElement(oe);
else
replaceOverlayElement(oe);
if (oe->isValid())
{
if (m_couldOverlap)
addOverlayElement(oe);
else
replaceOverlayElement(oe);
}
}
bool greater_priority(shared_ptr<OverlayElement> const & l,

11
yg/overlay_element.cpp
View file

@ -17,6 +17,7 @@ namespace yg
m_isNeedRedraw(true),
m_isFrozen(false),
m_isVisible(true),
m_isValid(true),
m_isDirtyRect(true),
m_isDirtyRoughRect(true)
{}
@ -151,6 +152,16 @@ namespace yg
return false;
}
bool OverlayElement::isValid() const
{
return m_isValid;
}
void OverlayElement::setIsValid(bool flag)
{
m_isValid = flag;
}
bool OverlayElement::roughHitTest(m2::PointD const & pt) const
{
return roughBoundRect().IsPointInside(pt);

4
yg/overlay_element.hpp
View file

@ -24,6 +24,7 @@ namespace yg
bool m_isNeedRedraw;
bool m_isFrozen;
bool m_isVisible;
bool m_isValid;
mutable bool m_isDirtyRect;
mutable bool m_isDirtyRoughRect;
@ -74,6 +75,9 @@ namespace yg
bool isVisible() const;
void setIsVisible(bool flag);
bool isValid() const;
void setIsValid(bool flag);
bool hitTest(m2::PointD const & pt) const;
bool roughHitTest(m2::PointD const & pt) const;

9
yg/path_text_element.cpp
View file

@ -16,7 +16,7 @@ namespace yg
p.m_position)
{
setPivot(m_glyphLayout.pivot());
setIsVisible((m_glyphLayout.firstVisible() == 0) && (m_glyphLayout.lastVisible() == visText().size()));
setIsValid((m_glyphLayout.firstVisible() == 0) && (m_glyphLayout.lastVisible() == visText().size()));
}
PathTextElement::PathTextElement(PathTextElement const & src, math::Matrix<double, 3, 3> const & m)
@ -24,7 +24,7 @@ namespace yg
m_glyphLayout(src.m_glyphLayout, m)
{
setPivot(m_glyphLayout.pivot());
setIsVisible((m_glyphLayout.firstVisible() == 0) && (m_glyphLayout.lastVisible() == visText().size()));
setIsValid((m_glyphLayout.firstVisible() == 0) && (m_glyphLayout.lastVisible() == visText().size()));
}
vector<m2::AnyRectD> const & PathTextElement::boundRects() const
@ -63,16 +63,13 @@ namespace yg
screen->drawRectangle(boundRects()[i], c, yg::maxDepth - 3);
}
if (!isNeedRedraw())
if (!isNeedRedraw() || !isVisible() || !isValid())
return;
yg::FontDesc desc = m_fontDesc;
if (desc.m_isMasked)
{
if (!isVisible())
return;
drawTextImpl(m_glyphLayout, screen, m, false, desc, yg::maxDepth - 1);
desc.m_isMasked = false;
}