dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2807:975df4680ff7

iOS: Need to trigger window menu rebuilds if a menu item changes. Currently if code changes the checked or enabled state of a menu item it triggers a repopulation of all menus on all windows. We may be able to reduce this by attempting to detect which window the menu item is a descendant of and only repopulate that menu... however this will do for now.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 20 Jul 2022 19:22:06 +0000
parents	deefe6f5d716
children	9c9b680f7772

comparison

equal deleted inserted replaced

-:d7b6e19e44d2
+:975df4680ff7
 {
 UIMenu *menu;
 NSMutableArray *children;
 NSString *title;
 unsigned long tag;
+UIWindow *window;
 }
 -(id)initWithTag:(unsigned long)newtag;
 -(void)setTitle:(NSString *)input;
 -(UIMenu *)menu;
 -(unsigned long)tag;
 -(void)layoutSubviews;
 -(void)setMenu:(DWMenu *)input;
 -(void)setPopupMenu:(DWMenu *)input;
 -(DWMenu *)menu;
 -(DWMenu *)popupMenu;
+-(void)updateMenu;
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 @end
 @implementation DWWindow
 -(int)shown { return shown; }
 -(void)setShown:(int)val { shown = val; }
 -(void)layoutSubviews { }
 -(void)setMenu:(DWMenu *)input { [windowmenu release]; windowmenu = input; [windowmenu retain]; }
 -(void)setPopupMenu:(DWMenu *)input { [popupmenu release]; popupmenu = input; [popupmenu retain]; }
+-(void)updateMenu
+{
+if(windowmenu)
+{
+NSArray *array = [[[self rootViewController] view] subviews];
+UINavigationBar *nav = nil;
+for(id obj in array)
+{
+if([obj isMemberOfClass:[UINavigationBar class]])
+nav = obj;
+}
+if(nav)
+{
+UINavigationItem *item = [[nav items] firstObject];
+if (@available(iOS 14.0, *)) {
+if(item && item.rightBarButtonItem && item.rightBarButtonItem.menu)
+[item.rightBarButtonItem setMenu:[windowmenu menu]];
+}
+}
+}
+}
 -(DWMenu *)menu { return windowmenu; }
 -(DWMenu *)popupMenu { return popupmenu; }
 -(void)closeWindow:(id)sender
 {
 if(_dw_event_handler(self, nil, _DW_EVENT_DELETE) < 1)
 if(@available(iOS 14.0, *))
 menu = [UIMenu menuWithChildren:menuchildren];
 else
 menu = [UIMenu menuWithTitle:@"" children:menuchildren];
 }
+[menu retain];
 if(oldmenu)
 [oldmenu release];
 return menu;
 }
 -(void)addItem:(id)item
 return child;
 }
 }
 return nil;
 }
--(void)dealloc { [super dealloc]; }
+-(void)dealloc
+{
+if(menu)
+[menu release];
+[super dealloc];
+}
 @end
 @implementation DWImage
 -(id)initWithSize:(CGSize)size
 {
 nstr = [NSString stringWithUTF8String:newtitle];
 free(newtitle);
 item = [DWMenuItem actionWithTitle:nstr image:nil identifier:nil
 handler:^(__kindof UIAction * _Nonnull action) {
+if(check)
+{
+UIMenuElementState state = [item state] == UIMenuElementStateOn ? UIMenuElementStateOff : UIMenuElementStateOn;
+[item setState:state];
+}
 [DWObj menuHandler:item];
+if(check)
+{
+for(id obj in _dw_toplevel_windows)
+[obj updateMenu];
+}
 }];
 /* Don't set the tag if the ID is 0 or -1 */
 if(itemid != DW_MENU_AUTO && itemid != DW_MENU_POPUP)
 [item setTag:itemid];
 [menu addItem:item];
 id menu = menux;
 DWMenuItem *menuitem = [menu childWithTag:itemid];
 if(menuitem != nil)
 {
-if(check)
+UIMenuElementState newstate = check ? UIMenuElementStateOn : UIMenuElementStateOff;
-[menuitem setState:UIMenuElementStateOn];
-else
+/* Only force the menus to repopulate if something changed */
-[menuitem setState:UIMenuElementStateOff];
+if(newstate != [menuitem state])
+{
+[menuitem setState:newstate];
+for(id obj in _dw_toplevel_windows)
+[obj updateMenu];
+}
 }
 }
 /*
 * Deletes the menu item specified.
 id menu = menux;
 DWMenuItem *menuitem = [menu childWithTag:itemid];
 if(menuitem != nil)
 {
+UIMenuElementState oldstate = [menuitem state];
+BOOL oldenabled = [menuitem enabled];
 if(state & DW_MIS_CHECKED)
-{
 [menuitem setState:UIMenuElementStateOn];
-}
 else if(state & DW_MIS_UNCHECKED)
-{
 [menuitem setState:UIMenuElementStateOff];
-}
 if(state & DW_MIS_ENABLED)
-{
 [menuitem setEnabled:YES];
-}
 else if(state & DW_MIS_DISABLED)
-{
 [menuitem setEnabled:NO];
+/* Only force the menus to repopulate if something changed */
+if(oldstate != [menuitem state] || oldenabled != [menuitem enabled])
+{
+for(id obj in _dw_toplevel_windows)
+[obj updateMenu];
 }
 }
 }
 /* Gets the notebook page from associated ID */
 [mle setTextAlignment:(style & mask)];
 }
 else if([object isMemberOfClass:[DWMenuItem class]])
 {
 DWMenuItem *menuitem = object;
+UIMenuElementState oldstate = [menuitem state];
+BOOL oldenabled = [menuitem enabled];
 if(mask & (DW_MIS_CHECKED | DW_MIS_UNCHECKED))
 {
 if(style & DW_MIS_CHECKED)
 [menuitem setState:UIMenuElementStateOn];
 {
 if(style & DW_MIS_ENABLED)
 [menuitem setEnabled:YES];
 else if(style & DW_MIS_DISABLED)
 [menuitem setEnabled:NO];
+}
+/* Only force the menus to repopulate if something changed */
+if(oldstate != [menuitem state] || oldenabled != [menuitem enabled])
+{
+for(id obj in _dw_toplevel_windows)
+[obj updateMenu];
 }
 }
 DW_FUNCTION_RETURN_NOTHING;
 }

Mercurial > dwindows

comparison ios/dw.m @ 2807:975df4680ff7