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

Timestamp:

04/15/15 15:37:04 (10 years ago)

Author:

epyon

Message:

• separation of the graphics code from the gui code

File:

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

trunk/src/gui/gui_environment.cc

@@ -22 +22 @@
         */
 
-#include "nv/gfx/sliced_buffer.hh"
-#include "nv/gfx/texture_atlas.hh"
-
-nv::gui::environment::environment( window* w )
-        : m_renderer( nullptr ), m_window( w )
-{
-        m_area.dim( dimension( w->get_width(), w->get_height() ) );
-        m_renderer = new renderer( w );
-        m_screen   = create_element( handle(), m_area );
+
+nv::gui::environment::environment( renderer* r )
+        : m_renderer( r )
+{
+        m_screen   = create_element( handle(), m_renderer->get_area() );
 }
 
@@ -47 +43 @@
         if ( parent.is_nil() ) parent = m_screen;
 
-        handle result = m_elements.create();
-        element* e    = m_elements.get( result );
-        rectangle ar  = r;
-
-        if ( ar.ul.x < 0 ) { ar.ul.x += m_area.lr.x; ar.lr.x += m_area.lr.x; }
-        if ( ar.ul.y < 0 ) { ar.ul.y += m_area.lr.y; ar.lr.y += m_area.lr.y; }
+        handle result  = m_elements.create();
+        element* e     = m_elements.get( result );
+        rectangle ar   = r;
+        rectangle full = m_renderer->get_area();
+
+        if ( ar.ul.x < 0 ) { ar.ul.x += full.lr.x; ar.lr.x += full.lr.x; }
+        if ( ar.ul.y < 0 ) { ar.ul.y += full.lr.y; ar.lr.y += full.lr.y; }
 
         e->m_child_count = 0;