Merge lp:~unity-team/nux/nux.fix-pango-abuse into lp:nux/2.0

[Jason Smith]

UNBLOCK

Fixes severe slowness when laying lots of these bad boys out

[Jay Taoko (jaytaoko)]

Please add a comment about what no_clip_size_ does in the .h. This will help preserve it in the future.
+1

review: Approve

[Gord Allott (gordallott)]

looks sane to me

review: Approve

[lp:~unity-team/nux/nux.fix-pango-abuse]

553. By Jason Smith on 2012-02-02

add comment to explain stuff

=== modified file 'Nux/StaticText.cpp'
--- Nux/StaticText.cpp	2012-01-17 04:34:19 +0000
+++ Nux/StaticText.cpp	2012-02-02 17:16:19 +0000
@@ -267,6 +267,9 @@
     pango_font_name_ = std::string(os.str());
 #endif
 
+    // reset cache
+    no_clip_size_.width = 0;
+    no_clip_size_.height = 0;
     // Changing the font can cause the StaticView to resize itself.
     Size sz = GetTextSizeNoClip();
     // Calling SetBaseSize will trigger a layout request of this view and all of its parents.
@@ -295,6 +298,10 @@
 
     text_ = text;
 
+    // reset cache
+    no_clip_size_.width = 0;
+    no_clip_size_.height = 0;
+
     // Changing the font can cause the StaticView to resize itself.
     Size sz = GetTextSizeNoClip();
     // Calling SetBaseSize will trigger a layout request of this view and all of its parents.
@@ -332,6 +339,10 @@
     os << font_name_ << " " << font_size_;
     pango_font_name_ = std::string(os.str());
 #endif
+    
+    // reset cache
+    no_clip_size_.width = 0;
+    no_clip_size_.height = 0;
 
     // Changing the font can cause the StaticView to resize itself.
     Size sz = GetTextSizeNoClip();
@@ -377,7 +388,9 @@
   
   Size StaticText::GetTextSizeNoClip()
   {
-    return ComputeTextSize(false, false);
+    if (no_clip_size_.width == 0)
+      no_clip_size_ = ComputeTextSize(false, false);
+    return no_clip_size_;
   }
 
 #if defined(NUX_STATIC_TEXT_USE_DIRECT_WRITE)

=== modified file 'Nux/StaticText.h'
--- Nux/StaticText.h	2012-01-17 04:34:19 +0000
+++ Nux/StaticText.h	2012-02-02 17:16:19 +0000
@@ -192,6 +192,7 @@
     Size GetTextSizeNoClip();
     float padding_x_; //!< Adds a padding around the entire text box.
     float padding_y_; //!< Adds a padding around the entire text box.
+    Size no_clip_size_; //! Cacne of the GetTextSizeNoClip results so we don't recompute them constantly.
   };
 
 }