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

Fix testing of multi-label alt shortcuts (#974)

Browse Source 
* find_shortcut(): fix testing of multi-label alt shortcuts
* Use static function instead of macro
This commit is contained in:
dannye 2024-08-04 04:53:35 -05:00 committed by GitHub
parent 9bb9cb3f96
commit 46dd1b33cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Fl_Menu.cxx
View File

@ -1155,6 +1155,10 @@ const Fl_Menu_Item* Fl_Menu_Item::popup(
return pulldown(X, Y, 0, 0, picked, menu_button, title ? &dummy : 0);
}
static bool is_special_labeltype(uchar t) {
return t == _FL_MULTI_LABEL || t == _FL_ICON_LABEL || t == _FL_IMAGE_LABEL;
}
/**
Search only the top level menu for a shortcut.
Either &x in the label or the shortcut fields are used.
@ -1172,7 +1176,13 @@ const Fl_Menu_Item* Fl_Menu_Item::find_shortcut(int* ip, const bool require_alt)
if (m) for (int ii = 0; m->text; m = next_visible_or_not(m), ii++) {
if (m->active()) {
if (Fl::test_shortcut(m->shortcut_)
|| Fl_Widget::test_shortcut(m->text, require_alt)) {
|| (!is_special_labeltype(m->labeltype_) && Fl_Widget::test_shortcut(m->text, require_alt))
|| (m->labeltype_ == _FL_MULTI_LABEL
&& !is_special_labeltype(((Fl_Multi_Label*)m->text)->typea)
&& Fl_Widget::test_shortcut(((Fl_Multi_Label*)m->text)->labela, require_alt))
|| (m->labeltype_ == _FL_MULTI_LABEL
&& !is_special_labeltype(((Fl_Multi_Label*)m->text)->typeb)
&& Fl_Widget::test_shortcut(((Fl_Multi_Label*)m->text)->labelb, require_alt))) {
if (ip) *ip=ii;
return m;
}