Changeset 444 for trunk/src/gui/gui_ascii_renderer.cc

Timestamp:

07/29/15 16:24:01 (10 years ago)

Author:

epyon

Message:

• slowly fixing up gui

File:

• trunk/src/gui/gui_ascii_renderer.cc (modified) (4 diffs)

trunk/src/gui/gui_ascii_renderer.cc

@@ -66 +66 @@
                         if ( m_style.get( e, "ascii_border_color", selector, border_color ) )
                                 er->border_color = uint32( border_color );
-                        for ( uint32 i = 0; i < 8 && i < path.length(); )
+                        for ( uint32 i = 0; i < 8 && i < path.length(); i++ )
                                 er->border_chars[i] = static_cast< uchar8 >( path[i] );
                 }
@@ -81 +81 @@
                 for ( int x = 0; x < abs.get_width(); ++x )
                 {
-                        m_terminal->print( position( abs.ul.y, abs.ul.x + x ), er->border_color, er->border_chars[0] );
-                        m_terminal->print( position( abs.lr.y, abs.ul.x + x ), er->border_color, er->border_chars[1] );
+                        m_terminal->print( position( abs.ul.x + x, abs.ul.y ), er->border_color, er->border_chars[0] );
+                        m_terminal->print( position( abs.ul.x + x, abs.lr.y ), er->border_color, er->border_chars[1] );
                 }
 
                 for ( int y = 0; y < abs.get_height(); ++y )
                 {
-                        m_terminal->print( position( abs.ul.y + y, abs.ul.x ), er->border_color, er->border_chars[2] );
-                        m_terminal->print( position( abs.ul.y + y, abs.lr.x ), er->border_color, er->border_chars[3] );
+                        m_terminal->print( position( abs.ul.x, abs.ul.y + y ), er->border_color, er->border_chars[2] );
+                        m_terminal->print( position( abs.lr.x, abs.ul.y + y ), er->border_color, er->border_chars[3] );
                 }
 
@@ -95 +95 @@
                 m_terminal->print( abs.ll(), er->border_color, er->border_chars[6] );
                 m_terminal->print( abs.lr,   er->border_color, er->border_chars[7] );
+                m_terminal->update();
         }
         if ( !e->m_text.empty() )
@@ -112 +113 @@
 }
 
-void nv::gui::ascii_renderer::on_hover_change( element* e, bool /*hover*/ )
+void nv::gui::ascii_renderer::on_style_change( element* e )
 {
-        // TODO: FIX
-        int fix_me;
-        NV_LOG_DEBUG( "on_hover_change" );
-        e->m_flags[DIRTY] = true;
+        m_style.load_flags( e );
 }
 
-void nv::gui::ascii_renderer::on_select_change( element* e, bool /*select*/ )
+void nv::gui::ascii_renderer::on_hover_change( element* e )
 {
-        // TODO: FIX
-        int fix_me;
-        NV_LOG_DEBUG( "on_select_change" );
-        e->m_flags[DIRTY] = true;
+        if ( e->m_flags[DIRTY_HOVER] ) e->m_flags[DIRTY] = true;
+}
+
+void nv::gui::ascii_renderer::on_select_change( element* e )
+{
+        if ( e->m_flags[DIRTY_SELECT] ) e->m_flags[DIRTY] = true;
 }