diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-10-24 12:53:41 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-10-24 12:53:41 +0000 |
| commit | 9e0efc1e888217d07cd1ac07e27f0f3d1ac1e52a (patch) | |
| tree | 4a31227368e8936afc2a03269954ee8dc654ffb7 /src | |
| parent | e001b30f18c6a46318d28d6a2446ab9e46a1455b (diff) | |
First fixes for 1.1.2 - Fl_Scrollbar shouldn't take keyboard focus,
move Fl_Slider focus stuff to main handle() method, use Fl_Light_Button
in scroll demo.
Bump version numbers to 1.1.2.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2690 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Scrollbar.cxx | 11 | ||||
| -rw-r--r-- | src/Fl_Slider.cxx | 7 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/Fl_Scrollbar.cxx b/src/Fl_Scrollbar.cxx index d5fbe987e..099e9ab5a 100644 --- a/src/Fl_Scrollbar.cxx +++ b/src/Fl_Scrollbar.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.13 2002/10/06 18:37:14 easysw Exp $" +// "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.14 2002/10/24 12:53:40 easysw Exp $" // // Scroll bar widget for the Fast Light Tool Kit (FLTK). // @@ -112,7 +112,6 @@ int Fl_Scrollbar::handle(int event) { handle_release(); return 1; case FL_PUSH: - if (Fl::visible_focus()) Fl::focus(this); if (pushed_) return 1; if (area != 8) pushed_ = area; if (pushed_) { @@ -130,12 +129,6 @@ int Fl_Scrollbar::handle(int event) { if (horizontal()) return 0; handle_drag(clamp(value() + linesize_ * Fl::e_dy)); return 1; - case FL_FOCUS : - case FL_UNFOCUS : - if (Fl::visible_focus()) { - redraw(); - return 1; - } else return 0; case FL_SHORTCUT: case FL_KEYBOARD: { int v = value(); @@ -249,5 +242,5 @@ Fl_Scrollbar::Fl_Scrollbar(int X, int Y, int W, int H, const char* L) } // -// End of "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.13 2002/10/06 18:37:14 easysw Exp $". +// End of "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.14 2002/10/24 12:53:40 easysw Exp $". // diff --git a/src/Fl_Slider.cxx b/src/Fl_Slider.cxx index 561e4444c..8a9b25684 100644 --- a/src/Fl_Slider.cxx +++ b/src/Fl_Slider.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Slider.cxx,v 1.8.2.10.2.10 2002/08/13 15:42:44 easysw Exp $" +// "$Id: Fl_Slider.cxx,v 1.8.2.10.2.11 2002/10/24 12:53:41 easysw Exp $" // // Slider widget for the Fast Light Tool Kit (FLTK). // @@ -171,7 +171,6 @@ int Fl_Slider::handle(int event, int X, int Y, int W, int H) { switch (event) { case FL_PUSH: if (!Fl::event_inside(X, Y, W, H)) return 0; - if (Fl::visible_focus()) Fl::focus(this); handle_push(); case FL_DRAG: { @@ -277,6 +276,8 @@ int Fl_Slider::handle(int event, int X, int Y, int W, int H) { } int Fl_Slider::handle(int event) { + if (event == FL_PUSH && Fl::visible_focus()) Fl::focus(this); + return handle(event, x()+Fl::box_dx(box()), y()+Fl::box_dy(box()), @@ -285,5 +286,5 @@ int Fl_Slider::handle(int event) { } // -// End of "$Id: Fl_Slider.cxx,v 1.8.2.10.2.10 2002/08/13 15:42:44 easysw Exp $". +// End of "$Id: Fl_Slider.cxx,v 1.8.2.10.2.11 2002/10/24 12:53:41 easysw Exp $". // |