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

[Mirco Müller]

Fixed drawing of broken ql-radio-item rendering by removing obsolete local member-variables shadowing member-variables of parent-class. Also see http://launchpadlibrarian.net/60276932/fixed-ql-radio-item.png

[Gord Allott (gordallott)]

Fixes the issue for me, code looks good, approved

review: Approve

=== modified file 'src/QuicklistMenuItemRadio.cpp'
--- src/QuicklistMenuItemRadio.cpp	2010-12-02 15:14:22 +0000
+++ src/QuicklistMenuItemRadio.cpp	2010-12-07 16:25:07 +0000
@@ -59,14 +59,9 @@
   _item_type  = MENUITEM_TYPE_LABEL;
   
   if (item)
-    _text = dbusmenu_menuitem_property_get (item, DBUSMENU_MENUITEM_PROP_LABEL);
+    _text = g_strdup (dbusmenu_menuitem_property_get (item, DBUSMENU_MENUITEM_PROP_LABEL));
   else
-    _text = "QuicklistItem";
-  
-  _normalTexture[0]   = NULL;
-  _normalTexture[1]   = NULL;
-  _prelightTexture[0] = NULL;
-  _prelightTexture[1] = NULL;
+    _text = g_strdup ("Radio Button");
 
   int textWidth = 1;
   int textHeight = 1;
@@ -94,6 +89,15 @@
 void
 QuicklistMenuItemRadio::PreLayoutManagement ()
 {
+  _pre_layout_width = GetBaseWidth ();
+  _pre_layout_height = GetBaseHeight ();
+
+  if (_normalTexture[0] == 0)
+  {
+    UpdateTexture ();
+  }
+
+  QuicklistMenuItem::PreLayoutManagement ();
 }
 
 long
@@ -137,7 +141,7 @@
                               bool                 forceDraw)
 {
   // Check if the texture have been computed. If they haven't, exit the function.
-  if (_normalTexture[0] == NULL)
+  if (!_normalTexture[0])
     return;
   
   nux::IntrusiveSP<nux::IOpenGLBaseTexture> texture;
@@ -154,16 +158,41 @@
                                          GL_ONE,
                                          GL_ONE_MINUS_SRC_ALPHA);
 
-  if (GetActive ())
-    if (GetEnabled ())
+  if (GetEnabled ())
+  {
+    if (GetActive () && _prelight)
+    {
+      texture = _prelightTexture[0]->GetDeviceTexture ();
+    }
+    else if (GetActive ())
+    {
+      texture = _normalTexture[0]->GetDeviceTexture ();
+    }
+
+    if ((!GetActive ()) && _prelight)
+    {
       texture = _prelightTexture[1]->GetDeviceTexture ();
-    else
-      texture = _prelightTexture[0]->GetDeviceTexture ();
-  else
-    if (GetEnabled ())
+    }
+    else if (!GetActive ())
+    {
       texture = _normalTexture[1]->GetDeviceTexture ();
+    }
+
+    _color = nux::Color::White;
+  }
+  else
+  {
+    if (GetActive ())
+    {
+      texture = _prelightTexture[0]->GetDeviceTexture ();
+    }
     else
+    {
       texture = _normalTexture[0]->GetDeviceTexture ();
+    }
+
+    _color = nux::Color::DarkGray;
+  }
 
   gfxContext.QRP_GLSL_1Tex (base.x,
                             base.y,
@@ -193,8 +222,9 @@
 void
 QuicklistMenuItemRadio::UpdateTexture ()
 {
-  int width  = GetBaseWidth ();
-  int height = GetBaseHeight ();
+  nux::Color transparent = nux::Color (0.0f, 0.0f, 0.0f, 0.0f);
+  int        width       = GetBaseWidth ();
+  int        height      = GetBaseHeight ();
 
   _cairoGraphics = new nux::CairoGraphics (CAIRO_FORMAT_ARGB32, width, height);
   cairo_t *cr = _cairoGraphics->GetContext ();
@@ -208,7 +238,7 @@
   cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 1.0f);
   cairo_set_line_width (cr, 1.0f);
 
-  DrawText (cr, width, height, _textColor);
+  DrawText (cr, width, height, nux::Color::White);
 
   nux::NBitmapData* bitmap = _cairoGraphics->GetBitmap ();
 
@@ -236,7 +266,7 @@
   cairo_fill (cr);
 
   cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  DrawText (cr, width, height, _textColor);
+  DrawText (cr, width, height, nux::Color::White);
 
   bitmap = _cairoGraphics->GetBitmap ();
 
@@ -266,7 +296,7 @@
 
   cairo_set_source_rgba (cr, 0.0f, 0.0f, 0.0f, 0.0f);
 
-  DrawText (cr, width, height, _textColor);
+  DrawText (cr, width, height, transparent);
 
   bitmap = _cairoGraphics->GetBitmap ();
 
@@ -299,7 +329,7 @@
   cairo_arc (cr, x, y, radius, 0.0f * (G_PI / 180.0f), 360.0f * (G_PI / 180.0f));
   cairo_fill (cr);
 
-  DrawText (cr, width, height, _textColor);
+  DrawText (cr, width, height, transparent);
 
   bitmap = _cairoGraphics->GetBitmap ();
 

=== modified file 'src/QuicklistMenuItemRadio.h'
--- src/QuicklistMenuItemRadio.h	2010-12-01 22:22:43 +0000
+++ src/QuicklistMenuItemRadio.h	2010-12-07 16:25:07 +0000
@@ -39,6 +39,7 @@
 
     ~QuicklistMenuItemRadio ();
 
+  protected:
     void PreLayoutManagement ();
 
     long PostLayoutManagement (long layoutResult);
@@ -56,19 +57,9 @@
     void PostDraw (nux::GraphicsEngine& gfxContext,
                    bool                 forceDraw);
 
-  private:
-    nux::NString          _text;
-    nux::Color            _textColor;
-    int                   _pre_layout_width;
-    int                   _pre_layout_height;
-    nux::CairoGraphics*   _cairoGraphics;
-
-    nux::BaseTexture* _normalTexture[2];
-    nux::BaseTexture* _prelightTexture[2];
-
     void Initialize (DbusmenuMenuitem* item);
     
-    void UpdateTexture ();
+    virtual void UpdateTexture ();
     virtual int CairoSurfaceWidth ();
 };