Merge lp:~canonical-dx-team/unity/unity.fix-681515 into lp:unity

[Jay Taoko]

fix for bug #681515
Avoid calculating the text size if the text is null.

[Neil J. Patel (njpatel)]

Looks good, approved.

review: Approve

=== modified file 'po/unity.pot'
--- po/unity.pot	2010-11-25 16:23:26 +0000
+++ po/unity.pot	2010-11-29 17:22:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-11-24 13:32-0500\n"
+"POT-Creation-Date: 2010-11-28 20:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'src/QuicklistMenuItem.cpp'
--- src/QuicklistMenuItem.cpp	2010-11-25 13:01:34 +0000
+++ src/QuicklistMenuItem.cpp	2010-11-29 17:22:20 +0000
@@ -237,6 +237,9 @@
   if (!font)
     return;
 
+  if (_text == NULL)
+    return;
+  
   surface = cairo_image_surface_create (CAIRO_FORMAT_A1, 1, 1);
   cr = cairo_create (surface);
   cairo_set_font_options (cr, gdk_screen_get_font_options (screen));
@@ -395,6 +398,9 @@
                              int        height,
                              nux::Color color)
 {
+  if (_text == NULL)
+    return;
+  
   int                   textWidth  = 0;
   int                   textHeight = 0;
   PangoLayout*          layout     = NULL;

=== modified file 'src/QuicklistMenuItemCheckmark.cpp'
--- src/QuicklistMenuItemCheckmark.cpp	2010-11-25 13:01:34 +0000
+++ src/QuicklistMenuItemCheckmark.cpp	2010-11-29 17:22:20 +0000
@@ -142,6 +142,10 @@
 {
   nux::IntrusiveSP<nux::IOpenGLBaseTexture> texture;
 
+  // Check if the texture have been computed. If they haven't, exit the function.
+  if (!_normalTexture[0])
+    return;
+  
   nux::Geometry base = GetGeometry ();
 
   gfxContext.PushClippingRectangle (base);

=== modified file 'src/QuicklistMenuItemLabel.cpp'
--- src/QuicklistMenuItemLabel.cpp	2010-11-25 13:01:34 +0000
+++ src/QuicklistMenuItemLabel.cpp	2010-11-29 17:22:20 +0000
@@ -129,6 +129,10 @@
 QuicklistMenuItemLabel::Draw (nux::GraphicsEngine& gfxContext,
                                   bool                 forceDraw)
 {
+  // Check if the texture have been computed. If they haven't, exit the function.
+  if (_normalTexture[0] == NULL)
+    return;
+  
   nux::IntrusiveSP<nux::IOpenGLBaseTexture> texture;
 
   nux::Geometry base = GetGeometry ();

=== modified file 'src/QuicklistMenuItemRadio.cpp'
--- src/QuicklistMenuItemRadio.cpp	2010-11-25 13:01:34 +0000
+++ src/QuicklistMenuItemRadio.cpp	2010-11-29 17:22:20 +0000
@@ -133,6 +133,10 @@
 QuicklistMenuItemRadio::Draw (nux::GraphicsEngine& gfxContext,
                               bool                 forceDraw)
 {
+  // Check if the texture have been computed. If they haven't, exit the function.
+  if (_normalTexture[0] == NULL)
+    return;
+  
   nux::IntrusiveSP<nux::IOpenGLBaseTexture> texture;
 
   nux::Geometry base = GetGeometry ();

=== modified file 'src/QuicklistMenuItemSeparator.cpp'
--- src/QuicklistMenuItemSeparator.cpp	2010-11-25 12:27:43 +0000
+++ src/QuicklistMenuItemSeparator.cpp	2010-11-29 17:22:20 +0000
@@ -26,7 +26,6 @@
 {
   SetMinimumHeight (3);
   SetBaseSize (64, 3);
-  _normalTexture = NULL;
   _item_type  = MENUITEM_TYPE_SEPARATOR;
 }
 
@@ -39,7 +38,6 @@
 {
   SetMinimumHeight (3);
   SetBaseSize (64, 3);
-  _normalTexture = NULL;
   _item_type  = MENUITEM_TYPE_SEPARATOR;
 }
 
@@ -53,7 +51,7 @@
   _pre_layout_width = GetBaseWidth ();
   _pre_layout_height = GetBaseHeight ();
 
-  if((_normalTexture == 0) )
+  if((_normalTexture[0] == 0) )
   {
     UpdateTexture ();
   }
@@ -102,6 +100,10 @@
 QuicklistMenuItemSeparator::Draw (nux::GraphicsEngine& gfxContext,
                                   bool                 forceDraw)
 {
+  // Check if the texture have been computed. If they haven't, exit the function.
+  if (_normalTexture[0] == 0)
+    return;  
+
   nux::Geometry base = GetGeometry ();
 
   gfxContext.PushClippingRectangle (base);
@@ -118,7 +120,7 @@
                             base.y,
                             base.width,
                             base.height,
-                            _normalTexture->GetDeviceTexture(),
+                            _normalTexture[0]->GetDeviceTexture(),
                             texxform,
                             _color);
 
@@ -160,19 +162,19 @@
 
   nux::NBitmapData* bitmap = _cairoGraphics->GetBitmap ();
 
-  if (_normalTexture)
-    _normalTexture->UnReference ();
+  if (_normalTexture[0])
+    _normalTexture[0]->UnReference ();
 
-  _normalTexture = nux::GetThreadGLDeviceFactory()->CreateSystemCapableTexture ();
-  _normalTexture->Update (bitmap);
+  _normalTexture[0] = nux::GetThreadGLDeviceFactory()->CreateSystemCapableTexture ();
+  _normalTexture[0]->Update (bitmap);
 
   delete _cairoGraphics;
 }
 
 int QuicklistMenuItemSeparator::CairoSurfaceWidth ()
 {
-  if (_normalTexture)
-    return _normalTexture->GetWidth ();
+  if (_normalTexture[0])
+    return _normalTexture[0]->GetWidth ();
   
   return 0;
 }
\ No newline at end of file

=== modified file 'src/QuicklistMenuItemSeparator.h'
--- src/QuicklistMenuItemSeparator.h	2010-11-25 12:27:43 +0000
+++ src/QuicklistMenuItemSeparator.h	2010-11-29 17:22:20 +0000
@@ -51,8 +51,6 @@
     void DrawContent (nux::GraphicsEngine& gfxContext, bool forceDraw);
 
     void PostDraw (nux::GraphicsEngine& gfxContext, bool forceDraw);
-    
-    nux::BaseTexture*   _normalTexture;
 
     virtual void UpdateTexture ();