diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2024-02-29 07:17:31 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2024-02-29 07:17:31 +0100 |
| commit | 5f2069871d00575717d998a2e1e3d398ec9137ef (patch) | |
| tree | 3eddf2746fa022211593f93cc23d813efe4abea8 /src | |
| parent | 367826979dc0cee609bf98e4b1e37c9019fbb4c6 (diff) | |
Move recognition of Ctrl= out of Fl::test_shortcut(unsigned)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Screen_Driver.cxx | 3 | ||||
| -rw-r--r-- | src/fl_shortcut.cxx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/Fl_Screen_Driver.cxx b/src/Fl_Screen_Driver.cxx index d63644e7c..623db30f6 100644 --- a/src/Fl_Screen_Driver.cxx +++ b/src/Fl_Screen_Driver.cxx @@ -485,6 +485,9 @@ int Fl_Screen_Driver::scale_handler(int event) if (Fl::test_shortcut(FL_COMMAND+'+')) zoom = zoom_in; else if (Fl::test_shortcut(FL_COMMAND+'-')) zoom = zoom_out; else if (Fl::test_shortcut(FL_COMMAND+'0')) zoom = zoom_reset; + // kludge to recognize shortcut FL_COMMAND+'+' without pressing SHIFT + else if ((Fl::event_state()&(FL_META|FL_ALT|FL_CTRL|FL_SHIFT)) == FL_COMMAND && + Fl::event_key() == '=') zoom = zoom_in; if (zoom != none) { int i, count; if (Fl::grab()) return 0; // don't rescale when menu windows are on diff --git a/src/fl_shortcut.cxx b/src/fl_shortcut.cxx index f5380be06..a1dba59d4 100644 --- a/src/fl_shortcut.cxx +++ b/src/fl_shortcut.cxx @@ -78,10 +78,6 @@ int Fl::test_shortcut(unsigned int shortcut) { if ((shift&FL_CTRL) && key >= 0x3f && key <= 0x5F && firstChar==(key^0x40)) return 1; // firstChar should be within a-z - // kludge to recognize shortcut FL_COMMAND+'+' without pressing SHIFT - if (shortcut == FL_COMMAND + '+' && - (shift&(FL_META|FL_ALT|FL_CTRL|FL_SHIFT)) == FL_COMMAND && - Fl::event_key() == '=') return 1; return 0; } |