summaryrefslogtreecommitdiff
path: root/src/Fl_Adjuster.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_Adjuster.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_Adjuster.cxx')
-rw-r--r--src/Fl_Adjuster.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Fl_Adjuster.cxx b/src/Fl_Adjuster.cxx
index 0abc9916f..764a56367 100644
--- a/src/Fl_Adjuster.cxx
+++ b/src/Fl_Adjuster.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Adjuster.cxx,v 1.5.2.3.2.2 2001/10/29 03:44:32 easysw Exp $"
+// "$Id: Fl_Adjuster.cxx,v 1.5.2.3.2.3 2001/11/03 19:24:22 easysw Exp $"
//
// Adjuster widget for the Fast Light Tool Kit (FLTK).
//
@@ -70,7 +70,7 @@ int Fl_Adjuster::handle(int event) {
int mx = Fl::event_x();
switch (event) {
case FL_PUSH:
- take_focus();
+ if (Fl::visible_focus()) take_focus();
ix = mx;
if (w()>=h())
drag = 3*(mx-x())/w() + 1;
@@ -142,8 +142,10 @@ int Fl_Adjuster::handle(int event) {
break;
case FL_FOCUS:
case FL_UNFOCUS:
- redraw();
- return 1;
+ if (Fl::visible_focus()) {
+ redraw();
+ return 1;
+ } else return 0;
}
return 0;
}
@@ -158,5 +160,5 @@ Fl_Adjuster::Fl_Adjuster(int x, int y, int w, int h, const char* l)
}
//
-// End of "$Id: Fl_Adjuster.cxx,v 1.5.2.3.2.2 2001/10/29 03:44:32 easysw Exp $".
+// End of "$Id: Fl_Adjuster.cxx,v 1.5.2.3.2.3 2001/11/03 19:24:22 easysw Exp $".
//