Merge lp:~hikiko/nux/nuxtex into lp:nux

[Eleni Maria Stea]

The textures of the widgets are now loaded the first time that GetImage or GetImageGeometry are called.

Solves bug #816692 (https://bugs.launchpad.net/nux/+bug/816692)
---------------------------------------------------------------
The textures of the widgets are now loaded the first time that GetImage or GetImageGeometry are called.

Concerns:
----------------------------
I wonder if there was a reason that nux used to preload all the textures related to a UXTheme. Does this change really improves the performance? (Depends on how many textures we have and how many of them are really needed)

[Jay Taoko (jaytaoko)]

* Replace NString with std::string

review: Needs Fixing

[Jay Taoko (jaytaoko)]

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'Nux/Theme.cpp'
--- Nux/Theme.cpp	2012-08-07 20:39:44 +0000
+++ Nux/Theme.cpp	2012-09-26 12:29:27 +0000
@@ -309,13 +309,10 @@
 
       if (1)
       {
-        BaseTexture* device_texture;
-
         NString filename = image->Attribute(TCHARToUTF8("Name"));
         NString texture_filename = NUX_FIND_RESOURCE_LOCATION_NOFAIL(filename.GetTCharPtr());
-        device_texture = Load2DTextureFile(texture_filename.GetTCharPtr());
-
-        pimage->texture = device_texture;
+        pimage->texture = 0;
+        pimage->filename = texture_filename;
       }
       else
       {
@@ -335,6 +332,12 @@
 
     for (it = painter_image_list_.begin(); it != painter_image_list_.end(); it++)
     {
+      if (!(*it)->texture)
+      {
+        BaseTexture* device_texture = Load2DTextureFile((*it)->filename.c_str());
+        (*it)->texture = device_texture;
+      }
+
       if ((*it)->style == style)
       {
         return (*it);
@@ -350,6 +353,12 @@
 
     for (it = painter_image_list_.begin(); it != painter_image_list_.end(); it++)
     {
+      if (!(*it)->texture)
+      {
+        BaseTexture* device_texture = Load2DTextureFile((*it)->filename.c_str());
+        (*it)->texture = device_texture;
+      }
+
       if ((*it)->style == style)
       {
         unsigned int width = (*it)->texture->GetWidth();

=== modified file 'Nux/Theme.h'
--- Nux/Theme.h	2012-07-26 00:17:42 +0000
+++ Nux/Theme.h	2012-09-26 12:29:27 +0000
@@ -126,6 +126,8 @@
     int border_top;
     int border_bottom;
     bool draw_borders_only;
+
+    std::string filename;
   };
 
   //! Load textures and other data for user interface rendering.