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

Timestamp:

02/15/15 21:33:48 (10 years ago)

Author:

epyon

Message:

• gui hover and selected support
• minor changes

File:

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

trunk/src/gui/gui_style.cc

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