From 22e7db916327ba8cb217b64cac3d2522822a8119 Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Thu, 24 Mar 2011 22:10:07 +0200
Subject: [PATCH] minor fixes for text_renderer debugging.

---
 yg/text_renderer.cpp | 17 +++++++++++++++++
 yg/text_renderer.hpp |  7 +++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/yg/text_renderer.cpp b/yg/text_renderer.cpp
index c74402e6f2..f693898118 100644
--- a/yg/text_renderer.cpp
+++ b/yg/text_renderer.cpp
@@ -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);
     }
 
diff --git a/yg/text_renderer.hpp b/yg/text_renderer.hpp
index db58bfe2fb..e7e6ce36ad 100644
--- a/yg/text_renderer.hpp
+++ b/yg/text_renderer.hpp
@@ -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();