DO NOT REPLY TO THIS MESSAGE. INSTEAD, POST ANY RESPONSES TO THE LINK BELOW.
[STR New]
Link: http://www.fltk.org/str.php?L2026
Version: 1.3-current
Fabien, I must admit that I looked at this patch already, and I saw that
there have been lots of unnecessary whitespace diffs. When I did it, I
also prepared a diff file without these whitespace diffs. I'll post it
here, too, in the hope that it makes things more clear - I hope it's not
too late to avoid unnecessary work. My diff is against rev. 6492, and
there hasn't been an update since.
Hope this helps.
Link: http://www.fltk.org/str.php?L2026
Version: 1.3-current
Index: src/Fl_Button.cxx
===================================================================
--- src/Fl_Button.cxx (revision 6492)
+++ src/Fl_Button.cxx (working copy)
@@ -135,6 +135,13 @@
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 @@
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;
}
_______________________________________________
fltk-bugs mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-bugs
