plusui-native-core 0.1.106 → 0.1.107

package/Core/Features/App/app.cpp

@@ -82,6 +82,10 @@ App::Builder &App::Builder::trayTooltip(const std::string &tooltip) {
   config.trayTooltip = tooltip;
   return *this;
 }
+App::Builder &App::Builder::tray(bool enable) {
+  config.tray = enable;
+  return *this;
+}
 App::Builder &App::Builder::alwaysOnTop(bool top) {
   config.alwaysOnTop = top;
   return *this;
@@ -144,12 +148,15 @@ Window App::Builder::build() {
     );
   }
 
-  if (!config.trayIconPath.empty()) {
-    nativeWinPtr->tray().setIcon(config.trayIconPath);
-    nativeWinPtr->tray().setVisible(true);
+  if (config.tray || !config.trayIconPath.empty()) {
+    auto& trayMgr = nativeWinPtr->tray();
+    if (!config.trayIconPath.empty()) {
+      trayMgr.setIcon(config.trayIconPath);
+    }
     if (!config.trayTooltip.empty()) {
-      nativeWinPtr->tray().setTooltip(config.trayTooltip);
+      trayMgr.setTooltip(config.trayTooltip);
     }
+    trayMgr.setVisible(true);
   }
 
   return webviewWin;

package/Core/Features/Tray/tray.cpp

@@ -27,7 +27,8 @@
 #include <stb_image.h>
 
 #ifdef __APPLE__
-#include <Cocoa/Cocoa.h>
+#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 #elif !defined(_WIN32)
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
@@ -50,6 +51,12 @@ struct TrayIcon::Impl {
 #ifdef _WIN32
   NOTIFYICONDATAW nid = {};
   HWND hwnd = nullptr;
+#elif defined(__APPLE__)
+  NSStatusItem* statusItem = nullptr;
+  NSMenu* menu = nullptr;
+#else
+  GtkStatusIcon* statusIcon = nullptr;
+  GtkMenu* menu = nullptr;
 #endif
 };
 
@@ -69,15 +76,44 @@ TrayIcon TrayIcon::create(const std::string &tooltip,
   icon.pImpl->nid.uID = 1;
   icon.pImpl->nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
   icon.pImpl->nid.hIcon = LoadIcon(nullptr, IDI_APPLICATION);
-  icon.pImpl->nid.uCallbackMessage = WM_APP + 1; // Example message
+  icon.pImpl->nid.uCallbackMessage = WM_APP + 1;
 
   if (!tooltip.empty()) {
     std::wstring wtooltip(tooltip.begin(), tooltip.end());
     wcsncpy_s(icon.pImpl->nid.szTip, _countof(icon.pImpl->nid.szTip),
               wtooltip.c_str(), _TRUNCATE);
   }
-
-  // Note: nim_add should be called after hwnd is set
+#elif defined(__APPLE__)
+  icon.pImpl->statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
+  if (icon.pImpl->statusItem) {
+    if (!iconPath.empty()) {
+      NSImage* nsImage = [[NSImage alloc] initWithContentsOfFile:[NSString stringWithUTF8String:iconPath.c_str()]];
+      if (nsImage) {
+        [nsImage setSize:NSMakeSize(18, 18)];
+        icon.pImpl->statusItem.button.image = nsImage;
+      }
+    }
+    if (!tooltip.empty()) {
+      icon.pImpl->statusItem.button.toolTip = [NSString stringWithUTF8String:tooltip.c_str()];
+    }
+    icon.pImpl->menu = [[NSMenu alloc] init];
+    icon.pImpl->statusItem.menu = icon.pImpl->menu;
+  }
+#else
+  icon.pImpl->statusIcon = gtk_status_icon_new();
+  if (icon.pImpl->statusIcon) {
+    gtk_status_icon_set_title(icon.pImpl->statusIcon, tooltip.empty() ? "PlusUI App" : tooltip.c_str());
+    if (!tooltip.empty()) {
+      gtk_status_icon_set_tooltip_text(icon.pImpl->statusIcon, tooltip.c_str());
+    }
+    if (!iconPath.empty()) {
+      gtk_status_icon_set_from_file(icon.pImpl->statusIcon, iconPath.c_str());
+    } else {
+      gtk_status_icon_set_from_icon_name(icon.pImpl->statusIcon, "application-x-executable");
+    }
+    icon.pImpl->menu = GTK_MENU(gtk_menu_new());
+    gtk_status_icon_set_visible(icon.pImpl->statusIcon, TRUE);
+  }
 #endif
 
   return icon;
@@ -90,6 +126,14 @@ void TrayIcon::show() {
     pImpl->nid.hWnd = pImpl->hwnd;
     Shell_NotifyIconW(NIM_ADD, &pImpl->nid);
   }
+#elif defined(__APPLE__)
+  if (pImpl->statusItem) {
+    pImpl->statusItem.button.hidden = NO;
+  }
+#else
+  if (pImpl->statusIcon) {
+    gtk_status_icon_set_visible(pImpl->statusIcon, TRUE);
+  }
 #endif
 }
 
@@ -97,6 +141,14 @@ void TrayIcon::hide() {
   pImpl->visible = false;
 #ifdef _WIN32
   Shell_NotifyIconW(NIM_DELETE, &pImpl->nid);
+#elif defined(__APPLE__)
+  if (pImpl->statusItem) {
+    pImpl->statusItem.button.hidden = YES;
+  }
+#else
+  if (pImpl->statusIcon) {
+    gtk_status_icon_set_visible(pImpl->statusIcon, FALSE);
+  }
 #endif
 }
 
@@ -109,6 +161,14 @@ void TrayIcon::setTooltip(const std::string &tooltip) {
               _TRUNCATE);
     Shell_NotifyIconW(NIM_MODIFY, &pImpl->nid);
   }
+#elif defined(__APPLE__)
+  if (pImpl->statusItem && !tooltip.empty()) {
+    pImpl->statusItem.button.toolTip = [NSString stringWithUTF8String:tooltip.c_str()];
+  }
+#else
+  if (pImpl->statusIcon && !tooltip.empty()) {
+    gtk_status_icon_set_tooltip_text(pImpl->statusIcon, tooltip.c_str());
+  }
 #endif
 }
 
@@ -121,6 +181,18 @@ void TrayIcon::setIcon(const std::string &iconPath) {
                                          16, LR_LOADFROMFILE);
     Shell_NotifyIconW(NIM_MODIFY, &pImpl->nid);
   }
+#elif defined(__APPLE__)
+  if (pImpl->statusItem && !iconPath.empty()) {
+    NSImage* nsImage = [[NSImage alloc] initWithContentsOfFile:[NSString stringWithUTF8String:iconPath.c_str()]];
+    if (nsImage) {
+      [nsImage setSize:NSMakeSize(18, 18)];
+      pImpl->statusItem.button.image = nsImage;
+    }
+  }
+#else
+  if (pImpl->statusIcon && !iconPath.empty()) {
+    gtk_status_icon_set_from_file(pImpl->statusIcon, iconPath.c_str());
+  }
 #endif
 }
 
@@ -167,7 +239,6 @@ void TrayIcon::setIconFromMemory(const unsigned char *data, size_t size) {
     std::vector<uint8_t> pixelVec(pixels, pixels + (width * height * 4));
 
 #ifdef _WIN32
-    // Windows expects BGRA, stb_image returns RGBA
     for (int i = 0; i < width * height; ++i) {
       uint8_t r = pixelVec[i * 4 + 0];
       uint8_t b = pixelVec[i * 4 + 2];
@@ -176,9 +247,33 @@ void TrayIcon::setIconFromMemory(const unsigned char *data, size_t size) {
     }
     setIconFromData(pixelVec, width, height);
 #elif defined(__APPLE__)
-    // Implementation for macOS (To be implemented)
+    if (pImpl->statusItem) {
+      NSBitmapImageRep* bitmap = [[NSBitmapImageRep alloc]
+          initWithBitmapDataPlanes:&pixels
+                        pixelsWide:width
+                        pixelsHigh:height
+                     bitsPerSample:8
+                   samplesPerPixel:4
+                          hasAlpha:YES
+                          isPlanar:NO
+                    colorSpaceName:NSCalibratedRGBColorSpace
+                       bytesPerRow:width * 4
+                      bitsPerPixel:32];
+      NSImage* nsImage = [[NSImage alloc] initWithSize:NSMakeSize(width, height)];
+      [nsImage addRepresentation:bitmap];
+      [nsImage setSize:NSMakeSize(18, 18)];
+      pImpl->statusItem.button.image = nsImage;
+    }
 #else
-    // Implementation for Linux (GTK) (To be implemented)
+    if (pImpl->statusIcon) {
+      GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(
+          pixels, GDK_COLORSPACE_RGB, TRUE, 8, width, height,
+          width * 4, nullptr, nullptr);
+      if (pixbuf) {
+        gtk_status_icon_set_from_pixbuf(pImpl->statusIcon, pixbuf);
+        g_object_unref(pixbuf);
+      }
+    }
 #endif
 
     stbi_image_free(pixels);
@@ -233,6 +328,16 @@ void TrayIcon::onMenuItemClick(
 void TrayIcon::dispose() {
 #ifdef _WIN32
   Shell_NotifyIconW(NIM_DELETE, &pImpl->nid);
+#elif defined(__APPLE__)
+  if (pImpl->statusItem) {
+    [[NSStatusBar systemStatusBar] removeStatusItem:pImpl->statusItem];
+    pImpl->statusItem = nil;
+  }
+#else
+  if (pImpl->statusIcon) {
+    gtk_widget_destroy(GTK_WIDGET(pImpl->statusIcon));
+    pImpl->statusIcon = nullptr;
+  }
 #endif
 }
 
@@ -315,13 +420,17 @@ void TrayManager::setIconFromMemory(const unsigned char *data, size_t size) {
   if (pImpl->mainIcon) {
     pImpl->mainIcon->setIconFromMemory(data, size);
   } else {
-    // Create the icon if it doesn't exist
     pImpl->mainIcon = std::make_unique<TrayIcon>(TrayIcon::create("", ""));
 #ifdef _WIN32
     pImpl->mainIcon->pImpl->nid.cbSize = sizeof(NOTIFYICONDATAW);
     pImpl->mainIcon->pImpl->hwnd = pImpl->hwnd;
 #endif
+    pImpl->icons.push_back(pImpl->mainIcon.get());
+    if (pImpl->onCreatedCallback) {
+      pImpl->onCreatedCallback(*pImpl->mainIcon);
+    }
     pImpl->mainIcon->setIconFromMemory(data, size);
+    pImpl->mainIcon->show();
   }
 }
 

package/Core/include/plusui/app.hpp

@@ -35,13 +35,14 @@ public:
     bool devtools = true;
     std::string trayIconPath;
     std::string trayTooltip;
+    bool tray = false;
     bool alwaysOnTop = false;
     bool centered = true;
     bool transparent = false;
     bool decorations = true;
     bool skipTaskbar = false;
     bool scrollbars = true;
-    bool fileDrop = true; // Enable OS file drop
+    bool fileDrop = true;
   };
 
   Builder();
@@ -53,6 +54,7 @@ public:
   Builder &devtools(bool d);
   Builder &trayIcon(const std::string &icon);
   Builder &trayTooltip(const std::string &tooltip);
+  Builder &tray(bool enable);
   Builder &alwaysOnTop(bool top);
   Builder &centered(bool center);
   Builder &transparent(bool transparent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plusui-native-core",
-  "version": "0.1.106",
+  "version": "0.1.107",
   "description": "PlusUI Core framework (frontend + backend implementations)",
   "type": "module",
   "main": "./Core/Features/API/index.ts",