Changeset 69 for trunk

Timestamp:

05/31/13 19:33:59 (12 years ago)

Author:

epyon

Message:

• gui::element - render_data, class, dirty and text fields added with proper accessors
• gui::element - on_event implemented and draw calling environment
• gui::environment skeleton class added

Location:

trunk

Files:

• nv/gui/gui_common.hh (modified) (1 diff)
• nv/gui/gui_element.hh (modified) (4 diffs)
• nv/gui/gui_environment.hh (added)
• src/gui/gui_element.cc (modified) (4 diffs)
• src/gui/gui_environment.cc (added)
• tests/lualib_test/lualib_test.cc (modified) (1 diff)

trunk/nv/gui/gui_common.hh

@@ -30 +30 @@
                 };
 
+                class render_data
+                {
+                public:
+                        ~render_data(){}
+                };
+
+                class element;
+                class environment;
+
         } // namespace gui
 

trunk/nv/gui/gui_element.hh

@@ -16 +16 @@
 #include <nv/object.hh>
 #include <nv/position.hh>
+#include <nv/io_event.hh>
+#include <nv/gui/gui_common.hh>
 
 namespace nv
@@ -21 +23 @@
         namespace gui
         {
-
                 class element : public object
                 {
@@ -30 +31 @@
                         virtual void on_update( uint32 elapsed );
                         virtual void on_draw();
-                        // bool on_event( event );
-                        bool contains( const position& p ) const;
+                        virtual bool on_event( const io_event& event );
+                        virtual bool contains( const position& p ) const;
                         virtual void set_relative( const rectangle& r );
                         virtual void set_relative( const position& p );
@@ -39 +40 @@
                         virtual bool is_enabled() const { return m_enabled; }
                         virtual bool is_visible() const { return m_visible; }
+                        virtual bool is_dirty()   const { return m_dirty; }
                         virtual void set_enabled( bool value ) { m_enabled = value; }
                         virtual void set_visible( bool value ) { m_visible = value; }
+                        virtual void set_dirty( bool value )   { m_dirty   = value; }
+                        virtual const string& get_text() const { return m_text; }
+                        virtual void set_text( const string& text ) { m_text = text; m_dirty = true; }
+                        virtual const string& get_class() const { return m_class; }
+                        virtual void set_class( const string& class_ ) { m_class = class_; m_dirty = true; }
                         virtual void recalculate_absolute();
                 protected:
+                        string    m_class;
+                        string    m_text;
                         rectangle m_relative;
                         rectangle m_absolute;
                         bool m_enabled;
                         bool m_visible;
+                        bool m_dirty;
+                        render_data* m_render_data;
                 };
 

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, "", 0 ), m_relative( r ), m_absolute( r ), m_enabled( true ), m_visible( true )
+        : object( aroot, "", 0 ), m_class(""), m_relative( r ), m_absolute( r ), m_enabled( true ), m_visible( true ), m_dirty( true )
 {
 
@@ -31 +33 @@
         if ( is_visible() )
         {
+                ((environment*)m_root)->draw( this );
                 for ( object* i : *this )
                 {
@@ -36 +39 @@
                 }
         }
+}
+
+bool element::on_event( const io_event& event )
+{
+        return m_parent ? ((element*)m_parent)->on_event( event ) : false;
 }
 
@@ -63 +71 @@
 void element::set_relative( const rectangle& r )
 {
+        m_dirty    = true;
         m_relative = r;
         recalculate_absolute();

trunk/tests/lualib_test/lualib_test.cc

@@ -8 +8 @@
 #include <iostream>
 #include <functional>
+#include <nv/gui/gui_element.hh>
 
 struct test_struct