summaryrefslogtreecommitdiff
path: root/src/Fl_Roller.cxx
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2001-11-03 19:24:22 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2001-11-03 19:24:22 +0000
commit0884e2ba0de126599e212f8a98f06d3a1df7a609 (patch)
tree08d6569b31711561cf4788f830ada150f288d343 /src/Fl_Roller.cxx
parentd3acd6c475de7fb811c4bde93ca735e3526ad82f (diff)
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
Diffstat (limited to 'src/Fl_Roller.cxx')
-rw-r--r--src/Fl_Roller.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Fl_Roller.cxx b/src/Fl_Roller.cxx
index 2ec920337..758b5bc53 100644
--- a/src/Fl_Roller.cxx
+++ b/src/Fl_Roller.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Roller.cxx,v 1.6.2.4.2.1 2001/08/05 14:00:15 easysw Exp $"
+// "$Id: Fl_Roller.cxx,v 1.6.2.4.2.2 2001/11/03 19:24:22 easysw Exp $"
//
// Roller widget for the Fast Light Tool Kit (FLTK).
//
@@ -35,7 +35,7 @@ int Fl_Roller::handle(int event) {
int newpos = horizontal() ? Fl::event_x() : Fl::event_y();
switch (event) {
case FL_PUSH:
- take_focus();
+ if (Fl::visible_focus()) take_focus();
handle_push();
ipos = newpos;
return 1;
@@ -69,8 +69,10 @@ int Fl_Roller::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;
default:
return 0;
}
@@ -166,5 +168,5 @@ Fl_Roller::Fl_Roller(int X,int Y,int W,int H,const char* L)
}
//
-// End of "$Id: Fl_Roller.cxx,v 1.6.2.4.2.1 2001/08/05 14:00:15 easysw Exp $".
+// End of "$Id: Fl_Roller.cxx,v 1.6.2.4.2.2 2001/11/03 19:24:22 easysw Exp $".
//