Changeset 487 for trunk/src/gui

Timestamp:

03/08/16 08:05:51 (9 years ago)

Author:

epyon

Message:

 

Location:

trunk/src/gui

Files:

• gui_ascii_renderer.cc (modified) (3 diffs)
• gui_gfx_renderer.cc (modified) (1 diff)
• gui_style.cc (modified) (1 diff)

trunk/src/gui/gui_ascii_renderer.cc

@@ -18 +18 @@
         bool   clear;
         bool   border;
-        uchar8 border_chars[8];
+        char   border_chars[8];
         uint32 border_color;
         uint32 text_color;
@@ -67 +67 @@
                                 er->border_color = uint32( border_color );
                         for ( uint32 i = 0; i < 8 && i < path.length(); i++ )
-                                er->border_chars[i] = static_cast< uchar8 >( path[i] );
+                                er->border_chars[i] = path[i];
                 }
         }
@@ -102 +102 @@
                 for ( char c : e->m_text )
                 {
-                        m_terminal->print( p, er->text_color, static_cast< unsigned char >( c ) );
+                        m_terminal->print( p, er->text_color, c );
                         ++p.x;
                 }

trunk/src/gui/gui_gfx_renderer.cc

@@ -311 +311 @@
                 }
 
-                e->m_text;
+//              e->m_text;
                 if ( !e->m_text.empty() )
                 {

trunk/src/gui/gui_style.cc

@@ -33 +33 @@
         if ( !resolve( e->m_id, e->m_class, cselector, centry, LUA_TTABLE ) ) return false;
         vec = vec4();
-        for ( int i = 0; i < 4; ++i )
+        for ( size_t i = 0; i < 4; ++i )
         {
-                lua_rawgeti( m_lua, -1, i+1 );
+                lua_rawgeti( m_lua, -1, int(i+1) );
                 if ( lua_isnil( m_lua, -1 ) ) return true;
                 vec[i] = static_cast< float >( lua_tonumber( m_lua, -1 ) );