From 0884e2ba0de126599e212f8a98f06d3a1df7a609 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sat, 3 Nov 2001 19:24:22 +0000 Subject: Update all non-text widgets that take keyboard focus to check Fl::visible_focus() before taking or accepting focus; this allows one to disable the new 1.1 keyboard focus stuff completely (not much sense allowing focus if you can't see it...) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1679 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Counter.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/Fl_Counter.cxx') diff --git a/src/Fl_Counter.cxx b/src/Fl_Counter.cxx index 08a40cf24..f850a98b6 100644 --- a/src/Fl_Counter.cxx +++ b/src/Fl_Counter.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Counter.cxx,v 1.8.2.3.2.3 2001/10/29 03:44:32 easysw Exp $" +// "$Id: Fl_Counter.cxx,v 1.8.2.3.2.4 2001/11/03 19:24:22 easysw Exp $" // // Counter widget for the Fast Light Tool Kit (FLTK). // @@ -131,7 +131,7 @@ int Fl_Counter::handle(int event) { handle_release(); return 1; case FL_PUSH: - take_focus(); + if (Fl::visible_focus()) take_focus(); handle_push(); case FL_DRAG: i = calc_mouseobj(); @@ -157,8 +157,10 @@ int Fl_Counter::handle(int event) { break; case FL_FOCUS : case FL_UNFOCUS : - damage(FL_DAMAGE_ALL); - return 1; + if (Fl::visible_focus()) { + redraw(); + return 1; + } else return 0; case FL_ENTER : case FL_LEAVE : return 1; @@ -186,5 +188,5 @@ Fl_Counter::Fl_Counter(int x, int y, int w, int h, const char* l) } // -// End of "$Id: Fl_Counter.cxx,v 1.8.2.3.2.3 2001/10/29 03:44:32 easysw Exp $". +// End of "$Id: Fl_Counter.cxx,v 1.8.2.3.2.4 2001/11/03 19:24:22 easysw Exp $". // -- cgit v1.2.3