Changeset 350 for trunk/src/gui/gui_style.cc

Timestamp:

02/04/15 16:37:00 (10 years ago)

Author:

epyon

Message:

• massive untracked updates

File:

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

trunk/src/gui/gui_style.cc

@@ -21 +21 @@
 }
 
-bool style::get( element* e, const std::string& entry, std::string& s )
+bool style::get( element* e, const char* centry, std::string& s )
 {
         lua::stack_guard guard( m_lua );
-        if ( !resolve( e, entry, LUA_TSTRING ) ) return false;
+        if ( !resolve( e->m_id.c_str(), e->m_class.c_str(), centry, LUA_TSTRING ) ) return false;
         s = lua_tostring( m_lua, -1 );
         return true;
 }
 
-bool style::get( element* e, const std::string& entry, vec4& vec )
+bool style::get( element* e, const char* centry, vec4& vec )
 {
         lua::stack_guard guard( m_lua );
-        if ( !resolve( e, entry, LUA_TTABLE ) ) return false;
+        if ( !resolve( e->m_id.c_str(), e->m_class.c_str(), centry, LUA_TTABLE ) ) return false;
         vec = vec4();
         for (size_t i = 0; i < 4; ++i )
@@ -44 +44 @@
 }
 
-bool style::get( element* e, const std::string& entry, int& i )
+bool style::get( element* e, const char* centry, int& i )
 {
         lua::stack_guard guard( m_lua );
-        if ( !resolve( e, entry, LUA_TNUMBER ) ) return false;
+        if ( !resolve( e->m_id.c_str(), e->m_class.c_str(), centry, LUA_TNUMBER ) ) return false;
         i = static_cast< int >( lua_tointeger( m_lua, -1 ) );
         return true;
 }
 
-bool style::get( element* e, const std::string& entry, double& d )
+bool style::get( element* e, const char* centry, double& d )
 {
         lua::stack_guard guard( m_lua );
-        if ( !resolve( e, entry, LUA_TNUMBER ) ) return false;
+        if ( !resolve( e->m_id.c_str(), e->m_class.c_str(), centry, LUA_TNUMBER ) ) return false;
         d = lua_tonumber( m_lua, -1 );
         return true;
@@ -64 +64 @@
 }
 
-bool style::resolve( element* e, const std::string& entry, int type )
+bool style::resolve( const char* cid, const char* cclass, const char* centry, int type )
 {
-        const char* centry = entry.c_str();
-        const char* cid    = e->m_id.c_str();
-        const char* cclass = e->m_class.c_str();
         lua_getglobal( m_lua, "default" );
         int global = lua_gettop( m_lua );