Changeset 257 for trunk/src/gui/gui_element.cc

Timestamp:

06/14/14 22:40:25 (11 years ago)

Author:

epyon

Message:

• object can now only created from root
• all registration is done root side
• gui::element draw and update logic fully in environment
• root removed from object - a lot less coupling

File:

• trunk/src/gui/gui_element.cc (modified) (1 diff)

trunk/src/gui/gui_element.cc

@@ -7 +7 @@
 #include "nv/gui/gui_element.hh"
 
-#include "nv/gui/gui_environment.hh"
-
 using namespace nv;
 using namespace nv::gui;
 
-element::element( root* aroot, const rectangle& r ) 
-        : object( aroot, "" ), m_class(""), m_relative( r ), m_absolute( r ), m_enabled( true ), m_visible( true ), m_dirty( true ), m_render_data( nullptr )
+element::element( const rectangle& r ) 
+        : object( "" ), m_class(""), m_relative( r ), m_absolute( r ), m_enabled( true ), m_visible( true ), m_dirty( true ), m_render_data( nullptr )
 {
 
-}
-
-void element::on_update( uint32 elapsed )
-{
-        if ( is_visible() )
-        {
-                for ( object* i : *this )
-                {
-                        ((element*)i)->on_update( elapsed );
-                }
-        }
-        ((environment*)m_root)->update( this, elapsed );
-}
-
-void element::on_draw()
-{
-        if ( is_visible() )
-        {
-                ((environment*)m_root)->draw( this );
-                for ( object* i : *this )
-                {
-                        ((element*)i)->on_draw();
-                }
-        }
 }