Changeset 492 for trunk/src/gui

Timestamp:

05/05/16 19:37:28 (9 years ago)

Author:

epyon

Message:

 

Location:

trunk/src/gui

Files:

• gui_environment.cc (modified) (2 diffs)
• gui_gfx_renderer.cc (modified) (1 diff)

trunk/src/gui/gui_environment.cc

@@ -182 +182 @@
                 { 
                         handle h = get_element( position( ev.mbutton.x, ev.mbutton.y ) );
+                        element* e = m_elements.get( h );
+                        if ( e->m_on_click ) e->m_on_click();
+
                         set_selected( h );
                         return true;
@@ -312 +315 @@
 }
 
+void nv::gui::environment::set_on_click( handle e, const function< void() >& on_click )
+{
+        element* ep = m_elements.get( e );
+        if ( ep != nullptr )
+        {
+                ep->m_on_click = on_click;
+        }
+}
+
 void nv::gui::environment::set_text( handle e, const string_twine& text )
 {

trunk/src/gui/gui_gfx_renderer.cc

@@ -249 +249 @@
                 const char* stext[] = { "", "selected", "hover" };
                 const char* selector = stext[border];
-                if ( e->m_flags[HOVER] )    selector = stext[2];
-                if ( e->m_flags[SELECTED] ) selector = stext[1];
+                if ( e->m_flags[HOVER] && e->m_flags[DIRTY_HOVER] )    selector = stext[2];
+                if ( e->m_flags[SELECTED] && e->m_flags[DIRTY_SELECT] ) selector = stext[1];
 
                 if ( m_style.get( e, "skin", selector, path ) )