Changeset 264 for trunk/src/gui/gui_environment.cc

Timestamp:

06/19/14 01:57:53 (11 years ago)

Author:

epyon

Message:

• decoupling - root doesn't have to be an object
• decoupling - gui::environment doesn't need a root object at all

File:

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

trunk/src/gui/gui_environment.cc

@@ -36 +36 @@
         m_screen = new screen( m_area );
         m_renderer = new renderer( w, shader_path );
-        root::add_child( m_screen );
 }
 
@@ -47 +46 @@
 {
         element* result = new element( r );
-        object_created( result );
         if ( parent == nullptr ) parent = m_screen;
         parent->add_child( result );
         return result;
+}
+
+void nv::gui::environment::destroy_element( element* e )
+{
+        destroy_children( e );
+        e->detach();
+        delete e;
 }
 
@@ -94 +99 @@
 }
 
-void environment::add_child( object* child )
+void environment::add_child( element* child )
 {
-        // TODO: check if element
         m_screen->add_child( child );
 }
 
+void environment::destroy_children( element* e )
+{
+        while ( !e->m_children.empty() )
+        {
+                destroy_element( (element*)e->m_children.front() );
+        }
+}
+
+
 environment::~environment()
 {
-        destroy_children( this );
+        destroy_element( m_screen );
         delete m_renderer;
 }