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

FLUID: Fix double reverse logic in FL_COMMAND handling

Browse Source
This commit is contained in:
Matthias Melcher 2024-02-10 14:55:52 +01:00
parent 1ed14867e6
commit a7bc26e12a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fluid/Fl_Menu_Type.cxx
View File

@ -398,8 +398,8 @@ void Fl_Menu_Item_Type::write_item(Fd_Code_Writer& f) {
int s = ((Fl_Button*)o)->shortcut();
f.write_c(", ");
if (g_project.use_FL_COMMAND) {
if (s & FL_COMMAND) { f.write_c("FL_COMMAND|"); s &= ~FL_COMMAND; }
if (s & FL_CONTROL) { f.write_c("FL_CONTROL|"); s &= ~FL_CONTROL; }
if (s & FL_CTRL) { f.write_c("FL_CONTROL|"); s &= ~FL_CTRL; }
if (s & FL_META) { f.write_c("FL_COMMAND|"); s &= ~FL_META; }
} else {
if (s & FL_CTRL) { f.write_c("FL_CTRL|"); s &= ~FL_CTRL; }
if (s & FL_META) { f.write_c("FL_META|"); s &= ~FL_META; }

4
fluid/Fl_Widget_Type.cxx
View File

@ -3105,8 +3105,8 @@ void Fl_Widget_Type::write_widget_code(Fd_Code_Writer& f) {
int s = shortcut;
f.write_c("%s%s->shortcut(", f.indent(), var);
if (g_project.use_FL_COMMAND) {
if (s & FL_COMMAND) { f.write_c("FL_COMMAND|"); s &= ~FL_COMMAND; }
if (s & FL_CONTROL) { f.write_c("FL_CONTROL|"); s &= ~FL_CONTROL; }
if (s & FL_CTRL) { f.write_c("FL_CONTROL|"); s &= ~FL_CTRL; }
if (s & FL_META) { f.write_c("FL_COMMAND|"); s &= ~FL_META; }
} else {
if (s & FL_CTRL) { f.write_c("FL_CTRL|"); s &= ~FL_CTRL; }
if (s & FL_META) { f.write_c("FL_META|"); s &= ~FL_META; }