Merge lp:~nick-dedekind/unity/static-cairo-text.TextureCacheFix into lp:unity

[Nick Dedekind]

Added handlers for StaticCairoText::SetMaximumSize/SetMaximumWidth which cause cached texture to be updated if width has changed.
StaticCairoText::GetTextExtents now updates need_new_extent_cache_ to false once the texture has updated so that it is not re-cached every time called.

Added handlers for StaticCairoText::SetMaximumSize/SetMaximumWidth which cause cached texture to be updated if width has changed.
StaticCairoText::GetTextExtents now updates need_new_extent_cache_ to false once the texture has updated so that it is not re-cached every time called.

[Neil J. Patel (njpatel)]

Works great, tested with trunk and the preview branches.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'unity-shared/StaticCairoText.cpp'
--- unity-shared/StaticCairoText.cpp	2012-07-12 15:54:25 +0000
+++ unity-shared/StaticCairoText.cpp	2012-08-15 16:32:19 +0000
@@ -67,7 +67,7 @@
 
   StaticCairoText* parent_;
   bool accept_key_nav_focus_;
-  bool need_new_extent_cache_;
+  mutable bool need_new_extent_cache_;
   // The three following are all set in get text extents.
   mutable Size cached_extent_;
   mutable Size cached_base_;
@@ -309,6 +309,29 @@
   }
 }
 
+void StaticCairoText::SetMaximumSize(int w, int h)
+{
+  if (w != GetMaximumWidth())
+  {
+    pimpl->need_new_extent_cache_ = true;
+    View::SetMaximumSize(w, h);
+    pimpl->UpdateTexture();
+    return;
+  } 
+
+  View::SetMaximumSize(w, h);
+}
+
+void StaticCairoText::SetMaximumWidth(int w)
+{
+  if (w != GetMaximumWidth())
+  {
+    pimpl->need_new_extent_cache_ = true;
+    View::SetMaximumWidth(w);
+    pimpl->UpdateTexture();
+  }
+}
+
 std::string StaticCairoText::GetText() const
 {
   return pimpl->text_;
@@ -333,12 +356,15 @@
 
 void StaticCairoText::SetFont(std::string const& font)
 {
-  pimpl->font_ = font;
-  pimpl->need_new_extent_cache_ = true;
-  Size s = GetTextExtents();
-  SetMinimumHeight(s.height);
-  NeedRedraw();
-  sigFontChanged.emit(this);
+  if (pimpl->font_ != font)
+  {  
+    pimpl->font_ = font;
+    pimpl->need_new_extent_cache_ = true;
+    Size s = GetTextExtents();
+    SetMinimumHeight(s.height);
+    NeedRedraw();
+    sigFontChanged.emit(this);
+  }
 }
 
 int StaticCairoText::GetLineCount() const
@@ -440,6 +466,7 @@
   result.height = std::ceil(static_cast<float>(logRect.height) / PANGO_SCALE);
   cached_extent_ = result;
   baseline_ = pango_layout_get_baseline(layout) / PANGO_SCALE;
+  need_new_extent_cache_ = false;
 
   // clean up
   pango_font_description_free(desc);

=== modified file 'unity-shared/StaticCairoText.h'
--- unity-shared/StaticCairoText.h	2012-07-12 15:54:25 +0000
+++ unity-shared/StaticCairoText.h	2012-08-15 16:32:19 +0000
@@ -92,6 +92,9 @@
 
   void SetAcceptKeyNavFocus(bool accept);
 
+  void SetMaximumSize(int w, int h);
+  void SetMaximumWidth(int w);
+
 protected:
   // Key navigation
   virtual bool AcceptKeyNavFocus();