mirror of https://github.com/fltk/fltk
Keyboard navigation for buttons.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1551 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
parent
e4727142d4
commit
11cc024107
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// "$Id: Fl_Button.cxx,v 1.4.2.6.2.2 2001/08/02 15:31:59 easysw Exp $"
|
||||
// "$Id: Fl_Button.cxx,v 1.4.2.6.2.3 2001/08/04 16:43:31 easysw Exp $"
|
||||
//
|
||||
// Button widget for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
|
|
@ -26,6 +26,7 @@
|
|||
#include <FL/Fl.H>
|
||||
#include <FL/Fl_Button.H>
|
||||
#include <FL/Fl_Group.H>
|
||||
#include <FL/fl_draw.H>
|
||||
|
||||
// There are a lot of subclasses, named Fl_*_Button. Some of
|
||||
// them are implemented by setting the type() value and testing it
|
||||
|
|
@ -55,6 +56,12 @@ void Fl_Button::draw() {
|
|||
//if (col == FL_GRAY && Fl::belowmouse()==this) col = FL_LIGHT1;
|
||||
draw_box(value() ? (down_box()?down_box():down(box())) : box(), col);
|
||||
draw_label();
|
||||
if (Fl::focus() == this) {
|
||||
fl_line_style(FL_DASH);
|
||||
fl_rect(x() + Fl::box_dx(box()), y() + Fl::box_dy(box()),
|
||||
w() - Fl::box_dw(box()) - 1, h() - Fl::box_dh(box()) - 1);
|
||||
fl_line_style(FL_SOLID);
|
||||
}
|
||||
}
|
||||
int Fl_Button::handle(int event) {
|
||||
int newval;
|
||||
|
|
@ -103,6 +110,22 @@ int Fl_Button::handle(int event) {
|
|||
}
|
||||
if (when() & FL_WHEN_RELEASE) do_callback(); else set_changed();
|
||||
return 1;
|
||||
case FL_FOCUS :
|
||||
case FL_UNFOCUS :
|
||||
redraw();
|
||||
return 1;
|
||||
case FL_KEYBOARD :
|
||||
if (Fl::focus() == this && Fl::event_key() == ' ') {
|
||||
if (type() == FL_RADIO_BUTTON && !value_) {
|
||||
setonly();
|
||||
if (when() & FL_WHEN_CHANGED) do_callback();
|
||||
} else if (type() == FL_TOGGLE_BUTTON) {
|
||||
value(!value());
|
||||
if (when() & FL_WHEN_CHANGED) do_callback();
|
||||
}
|
||||
if (when() & FL_WHEN_RELEASE) do_callback(); else set_changed();
|
||||
return 1;
|
||||
}
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -118,5 +141,5 @@ Fl_Button::Fl_Button(int x,int y,int w,int h, const char *l)
|
|||
}
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Button.cxx,v 1.4.2.6.2.2 2001/08/02 15:31:59 easysw Exp $".
|
||||
// End of "$Id: Fl_Button.cxx,v 1.4.2.6.2.3 2001/08/04 16:43:31 easysw Exp $".
|
||||
//
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// "$Id: Fl_Check_Button.cxx,v 1.4.2.3 2001/01/22 15:13:39 easysw Exp $"
|
||||
// "$Id: Fl_Check_Button.cxx,v 1.4.2.3.2.1 2001/08/04 16:43:31 easysw Exp $"
|
||||
//
|
||||
// Check button widget for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
Fl_Check_Button::Fl_Check_Button(int x, int y, int w, int h, const char *l)
|
||||
: Fl_Light_Button(x, y, w, h, l) {
|
||||
box(FL_NO_BOX);
|
||||
down_box(FL_DIAMOND_DOWN_BOX);
|
||||
selection_color(FL_RED);
|
||||
box(FL_FLAT_BOX);
|
||||
down_box(FL_DOWN_BOX);
|
||||
selection_color(FL_BLACK);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// "$Id: Fl_Light_Button.cxx,v 1.4.2.3 2001/01/22 15:13:40 easysw Exp $"
|
||||
// "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.1 2001/08/04 16:43:31 easysw Exp $"
|
||||
//
|
||||
// Lighted button widget for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
|
|
@ -36,21 +36,61 @@
|
|||
|
||||
void Fl_Light_Button::draw() {
|
||||
if (box()) draw_box(this==Fl::pushed() ? down(box()) : box(), color());
|
||||
Fl_Color col = value() ? selection_color() : color();
|
||||
Fl_Color col = value() ? (active_r() ? selection_color() :
|
||||
fl_inactive(selection_color())) : color();
|
||||
int d = h()/6;
|
||||
int W = w()<h() ? w() : h();
|
||||
if (down_box()) {
|
||||
// draw other down_box() styles:
|
||||
draw_box(down_box(), x()+d, y()+d+1, W-2*d-2, W-2*d-2, col);
|
||||
switch (down_box()) {
|
||||
case FL_DOWN_BOX :
|
||||
case FL_UP_BOX :
|
||||
// Check box...
|
||||
draw_box(down_box(), x()+d + 1, y()+d+2, W-2*d-4, W-2*d-4, color());
|
||||
if (value()) {
|
||||
fl_color(col);
|
||||
fl_line_style(FL_SOLID, 2);
|
||||
fl_line(x() + W - d - 6, y() + d + 4,
|
||||
x() + W / 2 - 2, y() + W - d - 6,
|
||||
x() + d + 4, y() + W / 2 - 1);
|
||||
fl_line_style(FL_SOLID);
|
||||
}
|
||||
break;
|
||||
case _FL_ROUND_DOWN_BOX :
|
||||
case _FL_ROUND_UP_BOX :
|
||||
// Radio button...
|
||||
draw_box(down_box(), x()+d + 1, y()+d+2, W-2*d-4, W-2*d-4, color());
|
||||
if (value()) {
|
||||
int size = W - 2 * d - 4;
|
||||
fl_color(col);
|
||||
if (size > 14) {
|
||||
fl_pie(x() + d + 5, y() + d + 6, size - 9, size - 9, 0.0, 360.0);
|
||||
} else {
|
||||
// Small circles don't draw well with some X servers...
|
||||
fl_rectf(x() + d + 6, y() + d + 6, 2, 4);
|
||||
fl_rectf(x() + d + 5, y() + d + 7, 4, 2);
|
||||
}
|
||||
}
|
||||
break;
|
||||
default :
|
||||
draw_box(down_box(), x()+d + 1, y()+d+2, W-2*d-4, W-2*d-4, col);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
// if down_box() is zero, draw light button style:
|
||||
int hh = h()-2*d;
|
||||
int hh = h()-2*d - 2;
|
||||
int ww = hh/2+1;
|
||||
int xx = d*2;
|
||||
if (w()<ww+2*xx) xx = (w()-ww)/2;
|
||||
draw_box(FL_THIN_DOWN_BOX, x()+xx, y()+d, ww, hh, col);
|
||||
draw_box(FL_THIN_DOWN_BOX, x()+xx, y()+d+1, ww, hh, col);
|
||||
}
|
||||
draw_label(x()+W-d, y(), w()-W+d, h());
|
||||
if (Fl::focus() == this) {
|
||||
fl_line_style(FL_DASH);
|
||||
fl_rect(x() + Fl::box_dx(box()), y() + Fl::box_dy(box()),
|
||||
w() - Fl::box_dw(box()) - 1, h() - Fl::box_dh(box()) - 1);
|
||||
fl_line_style(FL_SOLID);
|
||||
}
|
||||
}
|
||||
|
||||
int Fl_Light_Button::handle(int event) {
|
||||
|
|
@ -70,5 +110,5 @@ Fl_Light_Button::Fl_Light_Button(int x, int y, int w, int h, const char* l)
|
|||
}
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Light_Button.cxx,v 1.4.2.3 2001/01/22 15:13:40 easysw Exp $".
|
||||
// End of "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.1 2001/08/04 16:43:31 easysw Exp $".
|
||||
//
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// "$Id: Fl_Return_Button.cxx,v 1.5.2.3 2001/01/22 15:13:40 easysw Exp $"
|
||||
// "$Id: Fl_Return_Button.cxx,v 1.5.2.3.2.1 2001/08/04 16:43:31 easysw Exp $"
|
||||
//
|
||||
// Return button widget for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
|
|
@ -53,6 +53,11 @@ void Fl_Return_Button::draw() {
|
|||
if (w()/3 < W) W = w()/3;
|
||||
fl_return_arrow(x()+w()-W-4, y(), W, h());
|
||||
draw_label(x(), y(), w()-W+4, h());
|
||||
if (Fl::focus() == this) {
|
||||
fl_line_style(FL_DASH);
|
||||
fl_rect(x() + 4, y() + 4, w() - 8, h() - 8);
|
||||
fl_line_style(FL_SOLID);
|
||||
}
|
||||
}
|
||||
|
||||
int Fl_Return_Button::handle(int event) {
|
||||
|
|
@ -65,5 +70,5 @@ int Fl_Return_Button::handle(int event) {
|
|||
}
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Return_Button.cxx,v 1.5.2.3 2001/01/22 15:13:40 easysw Exp $".
|
||||
// End of "$Id: Fl_Return_Button.cxx,v 1.5.2.3.2.1 2001/08/04 16:43:31 easysw Exp $".
|
||||
//
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// "$Id: Fl_Round_Button.cxx,v 1.4.2.3 2001/01/22 15:13:40 easysw Exp $"
|
||||
// "$Id: Fl_Round_Button.cxx,v 1.4.2.3.2.1 2001/08/04 16:43:31 easysw Exp $"
|
||||
//
|
||||
// Round button for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
|
|
@ -32,11 +32,11 @@
|
|||
|
||||
Fl_Round_Button::Fl_Round_Button(int x,int y,int w,int h, const char *l)
|
||||
: Fl_Light_Button(x,y,w,h,l) {
|
||||
box(FL_NO_BOX);
|
||||
box(FL_FLAT_BOX);
|
||||
down_box(FL_ROUND_DOWN_BOX);
|
||||
selection_color(FL_RED);
|
||||
selection_color(FL_BLACK);
|
||||
}
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Round_Button.cxx,v 1.4.2.3 2001/01/22 15:13:40 easysw Exp $".
|
||||
// End of "$Id: Fl_Round_Button.cxx,v 1.4.2.3.2.1 2001/08/04 16:43:31 easysw Exp $".
|
||||
//
|
||||
|
|
|
|||
Loading…
Reference in New Issue