Fix issue where native menu would not reset

Calling SetMainMenu would append, oops
fyne-io · Jul 26, 2021 · 6edc898 · 6edc898
1 parent 7fedbdc
commit 6edc898
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 4 deletions.
diff --git a/internal/driver/glfw/menu_darwin.go b/internal/driver/glfw/menu_darwin.go
@@ -20,6 +20,7 @@ void        completeDarwinMenu(void* menu, bool prepend);
 const void* createDarwinMenu(const char* label);
 const void* darwinAppMenu();
 const void* insertDarwinMenuItem(const void* menu, const char* label, int id, int index, bool isSeparator);
+void        resetDarwinMenu();
 
 // Used for tests.
 const void* test_darwinMainMenu();
@@ -68,6 +69,10 @@ func addNativeSubmenu(w *window, nsParentMenuItem unsafe.Pointer, menu *fyne.Men
 	return nextItemID
 }
 
+func clearNativeMenu() {
+	C.resetDarwinMenu()
+}
+
 func createNativeMenu(w *window, menu *fyne.Menu, nextItemID int) (unsafe.Pointer, int) {
 	nsMenu := C.createDarwinMenu(C.CString(menu.Label))
 	for _, item := range menu.Items {
@@ -170,6 +175,7 @@ func menuChecked(id int) bool {
 }
 
 func setupNativeMenu(w *window, main *fyne.MainMenu) {
+	clearNativeMenu()
 	nextItemID := 0
 	callbacks = []*menuCallbacks{}
 	var helpMenu *fyne.Menu

diff --git a/internal/driver/glfw/menu_darwin.m b/internal/driver/glfw/menu_darwin.m
@@ -3,6 +3,8 @@
 #import <Foundation/Foundation.h>
 #import <AppKit/AppKit.h>
 
+const int menuTagMin = 5000;
+
 extern void menuCallback(int);
 extern BOOL menuEnabled(int);
 extern BOOL menuChecked(int);
@@ -14,17 +16,17 @@ @interface FyneMenuHandler : NSObject {
 
 @implementation FyneMenuHandler
 + (void) tapped:(NSMenuItem*) item {
-    menuCallback([item tag]);
+    menuCallback([item tag]-menuTagMin);
 }
 + (BOOL) validateMenuItem:(NSMenuItem*) item {
-    BOOL checked = menuChecked([item tag]);
+    BOOL checked = menuChecked([item tag]-menuTagMin);
     if (checked) {
         [item setState:NSOnState];
     } else {
         [item setState:NSOffState];
     }
 
-    return menuEnabled([item tag]);
+    return menuEnabled([item tag]-menuTagMin);
 }
 @end
 
@@ -41,6 +43,7 @@ void assignDarwinSubmenu(const void* i, const void* m) {
 void completeDarwinMenu(const void* m, bool prepend) {
     NSMenu* main = nativeMainMenu();
     NSMenuItem* top = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
+    [top setTag:menuTagMin];
     if (prepend) {
         [main insertItem:top atIndex:1];
     } else {
@@ -73,7 +76,7 @@ void handleException(const char* m, id e) {
             action:@selector(tapped:)
             keyEquivalent:@""];
         [item setTarget:[FyneMenuHandler class]];
-        [item setTag:id];
+        [item setTag:id+menuTagMin];
     }
 
     if (index > -1) {
@@ -90,6 +93,32 @@ void handleException(const char* m, id e) {
     return [app mainMenu];
 }
 
+void resetDarwinMenu() {
+    NSMenu *root = nativeMainMenu();
+    NSEnumerator *items = [[root itemArray] objectEnumerator];
+
+    id object;
+    while (object = [items nextObject]) {
+        NSMenuItem *item = object;
+        if ([item tag] < menuTagMin) {
+            // check for inserted items (like Settings...)
+            NSMenu *menu = [item submenu];
+            NSEnumerator *subItems = [[menu itemArray] objectEnumerator];
+
+            id sub;
+            while (sub = [subItems nextObject]) {
+                NSMenuItem *item = sub;
+                if ([item tag] >= menuTagMin) {
+                    [menu removeItem: item];
+                }
+            }
+
+            continue;
+        }
+        [root removeItem: item];
+    }
+}
+
 const void* test_darwinMainMenu() {
     return nativeMainMenu();
 }