#862: Fixes Fl_Shortut to swallow all FL_SHORCUT events if hot.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/Fl_Shortcut_Button.cxx b/src/Fl_Shortcut_Button.cxx
index f7d1d5b25..555371e0b 100644
--- a/src/Fl_Shortcut_Button.cxx
+++ b/src/Fl_Shortcut_Button.cxx
@@ -213,6 +213,7 @@ int Fl_Shortcut_Button::handle(int e) {
       if (hot_) {
         // Note: we can't really handle non-Latin shortcuts in the Fl_Shortcut
         //       type, so we don't handle them here either
+        // Todo: use fl_utf_tolower and fl_utf_toupper
         int v = fl_utf8decode(Fl::event_text(), 0, 0);
         if ( (v > 32 && v < 0x7f) || (v > 0xa0 && v <= 0xff) ) {
           if (isupper(v)) {
@@ -251,6 +252,9 @@ int Fl_Shortcut_Button::handle(int e) {
         }
       }
       break;
+    case FL_SHORTCUT:
+      if (hot_) return 1;
+      break;
   }
   return Fl_Button::handle(e);
 }