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

Timestamp:

07/23/15 21:16:01 (10 years ago)

Author:

epyon

Message:

• massive std::string removal
• no header depends on std::string anymore (or any other STL header)
• still some code files do (WIP)
• massive refactoring where std::string was used
• lua still messy (grep for string128 - used everywhere)
• string_twine added

File:

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

trunk/src/gui/gui_environment.cc

@@ -9 +9 @@
 #include "nv/gui/gui_renderer.hh"
 
-#include <algorithm> // std::find on std::list
-
         /*
 
@@ -27 +25 @@
         : m_renderer( r )
 {
+        r->set_environment( this );
         m_screen   = create_element( handle(), m_renderer->get_area() );
 }
@@ -161 +160 @@
                 while ( !parent->m_children.empty() )
                 {
-                        destroy_element( parent->m_children.front() );
+                        destroy_element( parent->m_children.back() );
                 }
         }
@@ -196 +195 @@
 }
 
+nv::string_view nv::gui::environment::get_string( shash64 h )
+{
+        return m_strings[h];
+}
+
 bool nv::gui::environment::set_selected( handle e )
 {
@@ -235 +239 @@
 
         handle result;
-        element::list::reverse_iterator it = el->m_children.rbegin();
+        auto it = el->m_children.rbegin();
 
         while ( it != el->m_children.rend() )
@@ -254 +258 @@
         if ( e && parent )
         {
-                auto it = std::find( parent->m_children.begin(), parent->m_children.end(), child );
+                auto it = find( parent->m_children.begin(), parent->m_children.end(), child );
                 if ( it != parent->m_children.end() )
                 {
@@ -264 +268 @@
 }
 
-void nv::gui::environment::move_to_bottom( handle child )
-{
-        element* e      = m_elements.get( child );
-        element* parent = m_elements.get( e->m_parent );
-        if ( e && parent )
-        {
-                auto it = std::find( parent->m_children.begin(), parent->m_children.end(), child );
-                if ( it != parent->m_children.end() )
-                {
-                        parent->m_children.erase( it );
-                        parent->m_children.push_front( child );
-                        parent->m_flags[DIRTY] = true;
-                }
-        }
-}
-
 void nv::gui::environment::set_relative( handle e, const rectangle& r )
 {
@@ -312 +300 @@
 }
 
-void nv::gui::environment::set_class( handle e, const std::string& text )
+void nv::gui::environment::set_class( handle e, const string_view& text )
 {
         element* ep = m_elements.get(e);
         if ( ep != nullptr )
         {
-                ep->m_class        = text;
+                ep->m_class        = m_strings.insert( text );
                 ep->m_flags[DIRTY] = true;
         }
 }
 
-void nv::gui::environment::set_text( handle e, const std::string& text )
+void nv::gui::environment::set_text( handle e, const string_twine& text )
 {
         element* ep = m_elements.get(e);
         if ( ep != nullptr )
         {
-                ep->m_text         = text;
+                ep->m_text.assign( text );
                 ep->m_flags[DIRTY] = true;
         }
@@ -337 +325 @@
         if ( p )
         {
-                auto it = std::find( p->m_children.begin(), p->m_children.end(), child );
+                auto it = find( p->m_children.begin(), p->m_children.end(), child );
                 if ( it != p->m_children.end() )
                 {
                         element* e = m_elements.get( *it );
                         e->m_parent = handle();
-                        p->m_children.erase(it);
-                }       
-        }
-}
-
+                        p->m_children.erase( it );
+                }
+        }
+}
+