Mercurial > hg > toolkit / file diff

--- a/ui/cocoa/Toolbar.m	Sun Aug 03 10:53:58 2025 +0200
+++ b/ui/cocoa/Toolbar.m	Sun Aug 03 12:26:06 2025 +0200
@@ -28,6 +28,7 @@
 
 #import "Toolbar.h"
 #import "EventData.h"
+#import "image.h"
 #import <objc/runtime.h>
 
 #include "../common/toolbar.h"
@@ -111,20 +112,17 @@
 @end
 
 NSToolbarItem* ui_nstoolbaritem_create_item(UiObject *obj, UiToolbarItem *item, NSString *identifier) {
-    NSToolbarItem *tbItem = [[NSToolbarItem alloc] initWithItemIdentifier: identifier];
-    
-    NSButton *button = [[NSButton alloc] init];
-    tbItem.view = button;
+    NSToolbarItem *button = [[NSToolbarItem alloc] initWithItemIdentifier: identifier];
+    button.bordered = YES;
     
     if(item->args.label) {
         NSString *label = [[NSString alloc] initWithUTF8String:item->args.label];
-        [tbItem setLabel:label];
-        if(!item->args.icon) {
-            button.title = label;
-        }
+        button.paletteLabel = label;
+        button.label = label;
     }
     if(item->args.icon) {
-        button.image = [NSImage imageNamed: [[NSString alloc] initWithUTF8String:item->args.icon]];
+        //button.image = [NSImage imageNamed: [[NSString alloc] initWithUTF8String:item->args.icon]];
+        button.image = ui_cocoa_named_icon(item->args.icon);
     }
     
     if(item->args.onclick) {
@@ -134,7 +132,7 @@
         button.action = @selector(handleEvent:);
         objc_setAssociatedObject(button, "eventdata", event, OBJC_ASSOCIATION_RETAIN);
     }
-    return tbItem;
+    return button;
 }
 
 NSToolbarItem* ui_nstoolbaritem_create_toggle(UiObject *obj, UiToolbarToggleItem *item, NSString *identifier) {