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

Move recognition of Ctrl= out of Fl::test_shortcut(unsigned)

Browse Source
This commit is contained in:
ManoloFLTK 2024-02-29 07:17:31 +01:00
parent 367826979d
commit 5f2069871d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Fl_Screen_Driver.cxx
View File

@ -485,6 +485,9 @@ int Fl_Screen_Driver::scale_handler(int event)
if (Fl::test_shortcut(FL_COMMAND+'+')) zoom = zoom_in; 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+'-')) zoom = zoom_out;
else if (Fl::test_shortcut(FL_COMMAND+'0')) zoom = zoom_reset; 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) { if (zoom != none) {
int i, count; int i, count;
if (Fl::grab()) return 0; // don't rescale when menu windows are on if (Fl::grab()) return 0; // don't rescale when menu windows are on

4
src/fl_shortcut.cxx
View File

@ -78,10 +78,6 @@ int Fl::test_shortcut(unsigned int shortcut) {
if ((shift&FL_CTRL) && key >= 0x3f && key <= 0x5F if ((shift&FL_CTRL) && key >= 0x3f && key <= 0x5F
&& firstChar==(key^0x40)) return 1; // firstChar should be within a-z && 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; return 0;
} }