Mercurial > dwindows
comparison ios/dw.m @ 2602:cc5013e626f7
iOS: Code cleanup, make sure menu items are enabled on creation.
Add comment about storing menu IDs.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sun, 11 Jul 2021 21:41:44 +0000 |
parents | 3201f9e9067b |
children | 592f3003f853 |
comparison
equal
deleted
inserted
replaced
2601:3201f9e9067b | 2602:cc5013e626f7 |
---|---|
2079 params[2] = DW_INT_TO_POINTER((int)point.x); | 2079 params[2] = DW_INT_TO_POINTER((int)point.x); |
2080 params[3] = DW_INT_TO_POINTER((int)point.y); | 2080 params[3] = DW_INT_TO_POINTER((int)point.y); |
2081 | 2081 |
2082 _dw_event_handler(self, (id)params, 10); | 2082 _dw_event_handler(self, (id)params, 10); |
2083 | 2083 |
2084 if(window) | 2084 if(window && [window popupMenu]) |
2085 { | 2085 { |
2086 __block UIMenu *popupmenu = [[[window popupMenu] menu] retain]; | 2086 __block UIMenu *popupmenu = [[[window popupMenu] menu] retain]; |
2087 config = [UIContextMenuConfiguration configurationWithIdentifier:nil | 2087 config = [UIContextMenuConfiguration configurationWithIdentifier:nil |
2088 previewProvider:nil | 2088 previewProvider:nil |
2089 actionProvider:^(NSArray* suggestedAction){return popupmenu;}]; | 2089 actionProvider:^(NSArray* suggestedAction){return popupmenu;}]; |
7618 free(newtitle); | 7618 free(newtitle); |
7619 | 7619 |
7620 item = [[DWMenuItem commandWithTitle:nstr image:nil | 7620 item = [[DWMenuItem commandWithTitle:nstr image:nil |
7621 action:@selector(menuHandler:) | 7621 action:@selector(menuHandler:) |
7622 propertyList:nil] autorelease]; | 7622 propertyList:nil] autorelease]; |
7623 /* Don't set the tag if the ID is 0 or -1 */ | |
7623 if(itemid != DW_MENU_AUTO && itemid != DW_MENU_POPUP) | 7624 if(itemid != DW_MENU_AUTO && itemid != DW_MENU_POPUP) |
7624 [item setTag:itemid]; | 7625 [item setTag:itemid]; |
7625 [menu addItem:item]; | 7626 [menu addItem:item]; |
7626 | 7627 |
7627 if(check) | 7628 if(check) |
7628 { | 7629 { |
7629 [item setCheck:YES]; | 7630 [item setCheck:YES]; |
7630 if(flags & DW_MIS_CHECKED) | 7631 if(flags & DW_MIS_CHECKED) |
7631 [item setState:UIMenuElementStateOn]; | 7632 [item setState:UIMenuElementStateOn]; |
7632 } | 7633 } |
7633 if(flags & DW_MIS_DISABLED) | 7634 [item setEnabled:(flags & DW_MIS_DISABLED ? NO : YES)]; |
7634 [item setEnabled:NO]; | |
7635 | 7635 |
7636 if(submenux) | 7636 if(submenux) |
7637 { | 7637 { |
7638 DWMenu *submenu = submenux; | 7638 DWMenu *submenu = submenux; |
7639 | 7639 |