Mercurial > hg > idav / file diff

--- a/ui/cocoa/MainWindow.m	Sun Jul 20 22:04:39 2025 +0200
+++ b/ui/cocoa/MainWindow.m	Sun Aug 24 15:24:16 2025 +0200
@@ -34,6 +34,7 @@
 
 #import "EventData.h"
 #import "menu.h"
+#import "Toolbar.h"
 
 @implementation MainWindow
 
@@ -48,6 +49,12 @@
                              backing:NSBackingStoreBuffered
                                defer:false];
     
+    if(uic_toolbar_isenabled()) {
+        UiToolbar *toolbar = [[UiToolbar alloc]initWithObject:obj];
+        [self setToolbar:toolbar];
+    }
+    
+    
     // create a vertical stackview as default container
     BoxContainer *vbox = [[BoxContainer alloc] init:NSUserInterfaceLayoutOrientationVertical spacing:0];
     //GridLayout *vbox = [[GridLayout alloc] init];
@@ -134,8 +141,13 @@
 - (void)menuItemAction:(id)sender {
     EventData *event = objc_getAssociatedObject(sender, "eventdata");
     if(event) {
-        event.obj = self.uiobj; // temporary set the event object
-        [event handleEvent:sender];
+        if(event.obj) {
+            [event handleEvent:sender];
+        } else {
+            event.obj = self.uiobj;
+            [event handleEvent:sender];
+            event.obj = NULL;
+        }
     }
 }