mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patch from STR2026 for testing

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6584 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Fabien Costantini 2008-12-16 16:30:26 +00:00
parent 21b8d6aa1a
commit 76bcfdd4de
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Fl_Button.cxx
View File

@ -135,6 +135,13 @@ int Fl_Button::handle(int event) {
value(!value());
set_changed();
if (when() & FL_WHEN_CHANGED) do_callback();
} else if ( (type() == FL_NORMAL_BUTTON) && when()&FL_WHEN_CHANGED) {
// Not already active by GUI push
if ( !value_ ) {
value_ = !oldval;
set_changed();
do_callback();
}
} else if (when() & FL_WHEN_RELEASE) do_callback();
return 1;
case FL_FOCUS :
@ -164,6 +171,36 @@ int Fl_Button::handle(int event) {
if (when() & FL_WHEN_RELEASE) do_callback();
return 1;
}
return 0;
case FL_KEYUP :
if ( (type() == FL_NORMAL_BUTTON) && when()&FL_WHEN_CHANGED) {
int key = Fl::event_key();
// Check for a shortcut that includes state keys(FL_SHIFT, FL_CTRL or FL_ALT) and
// the state key is released
if ( (shortcut()&FL_SHIFT && ((key == FL_Shift_L) || (key == FL_Shift_R))) ||
(shortcut()&FL_CTRL && ((key == FL_Control_L) || (key == FL_Control_R))) ||
(shortcut()&FL_ALT && ((key == FL_Alt_L) || (key == FL_Alt_R))) ) {
value(oldval);
set_changed();
do_callback();
return 0; // In case multiple shortcut keys are pressed that use state keys
}
// shortcut key alone
else if ( !(shortcut() ? Fl::test_shortcut(shortcut()) : test_shortcut())) {
return 0;
}
// disable button
else if ( value_ ) {
value(oldval);
set_changed();
do_callback();
return 1;
}
}
default:
return 0;
}