Tue, 24 Mar 2026 21:28:14 +0100
implement some icon macros for macos
| ui/cocoa/appdelegate.m | file | annotate | diff | comparison | revisions | |
| ui/cocoa/toolkit.m | file | annotate | diff | comparison | revisions | |
| ui/ui/icons.h | file | annotate | diff | comparison | revisions |
--- a/ui/cocoa/appdelegate.m Sun Mar 22 19:57:15 2026 +0100 +++ b/ui/cocoa/appdelegate.m Tue Mar 24 21:28:14 2026 +0100 @@ -40,6 +40,7 @@ } - (void)applicationWillTerminate:(NSNotification *)aNotification { + NSLog(@"toolkit applicationWillTerminate"); ui_cocoa_onexit(); }
--- a/ui/cocoa/toolkit.m Sun Mar 22 19:57:15 2026 +0100 +++ b/ui/cocoa/toolkit.m Tue Mar 24 21:28:14 2026 +0100 @@ -62,12 +62,12 @@ app_argv = (const char**)argv; uic_init_global_context(); - + uic_menu_init(); uic_toolbar_init(); - + uic_load_app_properties(); - + NSApplication *app = [NSApplication sharedApplication]; [app setActivationPolicy:NSApplicationActivationPolicyRegular]; @@ -75,6 +75,13 @@ //[[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp topLevelObjects:&topLevelObjects]; app_delegate = [[AppDelegate alloc] init]; + + if(app.delegate != nil) { + printf("app delegate exists\n"); + } else { + printf("app delegate is null\n"); + } + fflush(stdout); app.delegate = app_delegate;
--- a/ui/ui/icons.h Sun Mar 22 19:57:15 2026 +0100 +++ b/ui/ui/icons.h Tue Mar 24 21:28:14 2026 +0100 @@ -74,6 +74,25 @@ #define UI_ICON_GO_DOWN "" // TODO: implement workaround for missing down symbol #endif /* UI_WINUI */ + +#ifdef UI_COCOA + +#define UI_ICON_HOME "NSImageNameHomeTemplate" +#define UI_ICON_NEW_WINDOW "" +#define UI_ICON_REFRESH "NSImageNameRefreshTemplate" +#define UI_ICON_NEW_FOLDER "" +#define UI_ICON_ADD "NSImageNameAddTemplate" +#define UI_ICON_UPLOAD "" +#define UI_ICON_SAVE_LOCAL "" +#define UI_ICON_DELETE "" +#define UI_ICON_DOCK_LEFT "" +#define UI_ICON_DOCK_RIGHT "" +#define UI_ICON_GO_BACK "NSImageNameGoLeftTemplate" +#define UI_ICON_GO_FORWARD "NSImageNameGoRightTemplate" +#define UI_ICON_GO_UP "" +#define UI_ICON_GO_DOWN "" + +#endif /* UI_COCOA */ UIEXPORT UiIcon* ui_icon(const char* name, size_t size);