Merge lp:~nicovdw/nux/fix-for-753083-2 into lp:nux

[Nico van der Walt]

Changed GetTextSize to consider the correct font size when calculating text dimensions. Previously a default font size was assumed that prevented text to display correctly for font sizes larger than 12.

[Nico van der Walt (nicovdw)]

Hi Didier,

This is an additional patch for bug 753083. I did not test for font sizes larger than 12 previously.

There is still another problem with big fonts where the text is vertically cut off (try font size of 18 to demonstrate). I have submitted another patch for unity that fixes that: lp:~nicovdw/unity/fix-combobox-height

Thanks
Nico

[Didier Roche-Tolomelli (didrocks)]

Approved, nice catch!

(still font issues in the dash for a big font size, but not a regression from this one ;))
Thanks Nico :)

review: Approve

=== modified file 'Nux/StaticText.cpp'
--- Nux/StaticText.cpp	2011-04-15 09:58:05 +0000
+++ Nux/StaticText.cpp	2011-04-19 10:04:29 +0000
@@ -193,7 +193,7 @@
 
   void StaticText::GetTextSize (int &width, int &height, int clipping)
   {
-    GetTextSize (TEXT("Ubuntu"), _text.GetTCharPtr (), width, height, clipping);
+    GetTextSize (_font_string, _text.GetTCharPtr (), width, height, clipping);
   }
 
   void StaticText::GetTextSize (const TCHAR* font, const TCHAR *char_str, int& width, int& height, int clipping)