From f8d269725d6feeff7fa9304579acbcccf74ee9c0 Mon Sep 17 00:00:00 2001 From: Greg Ercolano Date: Mon, 30 Apr 2012 21:22:57 +0000 Subject: Fixes focus issues: o Nav keys were being used even if widget didn't have focus o When Fl_Input was used as immediate child, wasn't redrawing properly when typing into input fields. (noticed problem with test program in STR# 2832) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9413 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Tree_Item.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Fl_Tree_Item.cxx') diff --git a/src/Fl_Tree_Item.cxx b/src/Fl_Tree_Item.cxx index 5b8d8c471..96964fbcf 100644 --- a/src/Fl_Tree_Item.cxx +++ b/src/Fl_Tree_Item.cxx @@ -729,10 +729,11 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree, #if FLTK_ABI_VERSION >= 10302 if ( _label && ( !widget() || - (prefs.item_draw_mode() & FL_TREE_ITEM_DRAW_LABEL_AND_WIDGET) ) ) { + (prefs.item_draw_mode() & FL_TREE_ITEM_DRAW_LABEL_AND_WIDGET) ) ) #else - if ( _label && !widget() ) { // back compat: don't draw label if widget() present + if ( _label && !widget() ) // back compat: don't draw label if widget() present #endif + { fl_color(fg); fl_font(_labelfont, _labelsize); int label_y = Y+(H/2)+(_labelsize/2)-fl_descent()/2; @@ -740,9 +741,8 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree, } } // end non-child damage // Draw child FLTK widget? - if ( widget() && widget()->damage() ) { - widget()->draw(); - ((Fl_Tree*)tree)->draw_outside_label(*widget()); + if ( widget() ) { + ((Fl_Tree*)tree)->update_child(*widget()); // let group handle drawing child } // Draw focus box around item's bg last if ( this == itemfocus && -- cgit v1.2.3