Changeset 440 for trunk/src/gui/gui_gfx_renderer.cc

Timestamp:

07/23/15 21:16:01 (10 years ago)

Author:

epyon

Message:

• massive std::string removal
• no header depends on std::string anymore (or any other STL header)
• still some code files do (WIP)
• massive refactoring where std::string was used
• lua still messy (grep for string128 - used everywhere)
• string_twine added

File:

• trunk/src/gui/gui_gfx_renderer.cc (modified) (3 diffs)

trunk/src/gui/gui_gfx_renderer.cc

@@ -243 +243 @@
                 int border = 0;
                 vec4 color;
-                std::string path;
-                std::string text;
-                const char* stext[] = { nullptr, "selected", "hover" };
+                string128 path;
+                const char* stext[] = { "", "selected", "hover" };
                 const char* selector = stext[border];
                 if ( e->m_flags[HOVER] )    selector = stext[2];
@@ -252 +251 @@
                 if ( m_style.get( e, "skin", selector, path ) )
                 {
-                        size_t image_id = load_image( string_view( path.c_str(), path.size() ) );
+                        size_t image_id = load_image( path );
                         const image_info* image = get_image( image_id );
                         if ( image )
@@ -312 +311 @@
                 }
 
-                text = e->m_text;
-                if ( !text.empty() )
+                e->m_text;
+                if ( !e->m_text.empty() )
                 {
                         if ( m_style.get( e, "text_color", selector, color ) && m_style.get( e, "text_font", selector, path ) && m_style.get( e, "text_size", selector, border ) )
                         {
-                                size_t font_id = load_font( string_view( path.c_str(), path.size() ), size_t( border ) );
+                                size_t font_id = load_font( path, size_t( border ) );
                                 texture_font* font = get_font( font_id );
                                 position p = abs.ul + position( 0, border );
-                                for ( char c : text )
+                                for ( char c : e->m_text )
                                 {
                                         const texture_glyph* g = font->get_glyph( static_cast<uint16>( c ) );