Changeset 351 for trunk/src/gui/gui_renderer.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_renderer.cc (modified) (6 diffs)

trunk/src/gui/gui_renderer.cc

@@ -44 +44 @@
 using namespace nv;
 using namespace nv::gui;
+
+struct vertex
+{
+        ivec2 position;
+        vec2  texcoord;
+        vec4  color;
+        vertex() {}
+        vertex( const nv::ivec2& cr, const nv::vec2& tc, const nv::vec4& c )
+                : position( cr ), texcoord( tc ), color( c )
+        {
+        }
+};
 
 const ivec2 atlas_size = ivec2( 1024, 1024 );
@@ -239 +251 @@
                 std::string path;
                 std::string text;
-
-                if ( m_style.get( e, "skin", path ) )
+                const char* stext[] = { nullptr, "selected", "hover" };
+                const char* selector = stext[border];
+                if ( e->m_flags[HOVER] )    selector = stext[2];
+                if ( e->m_flags[SELECTED] ) selector = stext[1];
+
+                if ( m_style.get( e, "skin", selector, path ) )
                 {
                         size_t image_id = load_image( path );
@@ -286 +302 @@
                 {
 
-                        if ( m_style.get( e, "border", border ) && m_style.get( e, "border_color", color ) )
+                        if ( m_style.get( e, "border", selector, border ) && m_style.get( e, "border_color", selector, color ) )
                         {
                                 rectangle inner = abs.shrinked( border );
@@ -296 +312 @@
                         }
 
-                        if ( m_style.get( e, "background_color", color ) )
+                        if ( m_style.get( e, "background_color", selector, color ) )
                         {
                                 qvec.emplace_back( abs.ul, abs.lr, color );
@@ -305 +321 @@
                 if ( !text.empty() )
                 {
-                        if ( m_style.get( e, "text_color", color ) && m_style.get( e, "text_font", path ) && m_style.get( e, "text_size", border ) )
+                        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( path, (uint16)border );
@@ -331 +347 @@
 }
 
+void renderer::on_hover_change( element* e, bool hover )
+{
+        // TODO: FIX
+        NV_LOG( nv::LOG_DEBUG, "on_hover_change" );
+        e->m_flags[DIRTY] = true;
+}
+
+void renderer::on_select_change( element* e, bool select )
+{
+        // TODO: FIX
+        NV_LOG( nv::LOG_DEBUG, "on_select_change" );
+        e->m_flags[DIRTY] = true;
+}
+
+
 void renderer::draw( element* e )
 {