Merge pull request #3 from ElectronNET/master

903

Author: freosc

Changelog.md

@@ -1,5 +1,7 @@
 # Not released
 
+# Released
+
 # 9.31.1
 
 ElectronNET.CLI:
@@ -10,7 +12,7 @@ ElectronNET.CLI:
 
 ElectronNET.API:
 
-* New Feature: Native Electron 9.0.1 support, but not all new features (we search contributors)
+* New Feature: Native Electron 9.0.3 support, but not all new features (we search contributors)
 * New Feature: PowerMonitor API Support (thanks [gustavo-lara-molina](https://github.com/gustavo-lara-molina)) [\#399](https://github.com/ElectronNET/Electron.NET/pull/399) [\#423](https://github.com/ElectronNET/Electron.NET/pull/423)
 * New Feature: NativeTheme API Support (thanks [konstantingross](https://github.com/konstantingross)) [\#402](https://github.com/ElectronNET/Electron.NET/pull/402)
 * New Feature: Cookie API Support (thanks [freosc](https://github.com/freosc)) [\#413](https://github.com/ElectronNET/Electron.NET/pull/413)
@@ -22,14 +24,15 @@ ElectronNET.API:
 * Shell-Api Enhancement: API fixes for Electron 9.0.0 / Added missing parameters / Summaries rewritten (thanks [konstantingross](https://github.com/konstantingross)) [\#417](https://github.com/ElectronNET/Electron.NET/pull/417) [\#418](https://github.com/ElectronNET/Electron.NET/pull/418)
 * Notification-Api Enhancement: Added missing properties in Notifications (thanks [konstantingross](https://github.com/konstantingross)) [\#410](https://github.com/ElectronNET/Electron.NET/pull/410)
 * BrowserWindows-Api Enhancement: Add missing API call for SetProgressBar options (thanks [konstantingross](https://github.com/konstantingross)) [\#416](https://github.com/ElectronNET/Electron.NET/pull/416)
+* BrowserWindow Enhancement: Add BrowserWindow.GetNativeWindowHandle() (thanks [kdlslyv](https://github.com/kdlslyv)) [\#429](https://github.com/ElectronNET/Electron.NET/pull/429)
 * MacOS Enhancement: Application exit logic (thanks [dafergu2](https://github.com/dafergu2)) [\#405](https://github.com/ElectronNET/Electron.NET/pull/405)
 * Fixed bug: ElectronNET.API.Entities.WebPreferences.ContextIsolation [DefaultValue(true)] [\#411](https://github.com/ElectronNET/Electron.NET/issues/411)
 
 ElectronNET.WebApp (internal use):
 * Improvement debugging and testing new API calls (without install ElectronNET.CLI) (thanks [konstantingross](https://github.com/konstantingross)) [\#425](https://github.com/ElectronNET/Electron.NET/pull/425)
 * Fixed bug: Cannot find modules in ElectronHostHook (thanks [konstantingross](https://github.com/konstantingross)) [\#425](https://github.com/ElectronNET/Electron.NET/pull/425)
 
-# Released
+Thank you for donation [Phil Seeman](https://github.com/mpnow) ❤
 
 # 8.31.2
 

ElectronNET.API/BrowserWindow.cs

@@ -1809,6 +1809,25 @@ public Task<bool> IsKioskAsync()
             return taskCompletionSource.Task;
         }
 
+        /// <summary>
+        /// Returns the native type of the handle is HWND on Windows, NSView* on macOS, and Window (unsigned long) on Linux.
+        /// </summary>
+        /// <returns>string of the native handle obtained, HWND on Windows, NSView* on macOS, and Window (unsigned long) on Linux.</returns>
+        public Task<string> GetNativeWindowHandle()
+        {
+            var taskCompletionSource = new TaskCompletionSource<string>();
+
+            BridgeConnector.Socket.On("browserWindow-getNativeWindowHandle-completed", (nativeWindowHandle) =>
+            {
+                BridgeConnector.Socket.Off("browserWindow-getNativeWindowHandle-completed");
+                taskCompletionSource.SetResult(nativeWindowHandle.ToString());
+            });
+
+            BridgeConnector.Socket.Emit("browserWindowGetNativeWindowHandle", Id);
+
+            return taskCompletionSource.Task;
+        }
+
         /// <summary>
         /// Sets the pathname of the file the window represents, 
         /// and the icon of the file will show in window’s title bar.

ElectronNET.API/Tray.cs

@@ -263,6 +263,15 @@ public void Show(string image, MenuItem[] menuItems)
             });
         }
 
+        /// <summary>
+        /// Shows the Traybar (empty).
+        /// </summary>
+        /// <param name="image">The image.</param>
+        public void Show(string image)
+        {
+            BridgeConnector.Socket.Emit("create-tray", image);
+        }
+
         /// <summary>
         /// Destroys the tray icon immediately.
         /// </summary>

ElectronNET.CLI/Commands/BuildCommand.cs

@@ -186,7 +186,7 @@ public Task<bool> ExecuteAsync()
                 ProcessHelper.CmdExecute($"node build-helper.js " + manifestFileName, tempPath);
 
                 Console.WriteLine($"Package Electron App for Platform {platformInfo.ElectronPackerPlatform}...");
-                ProcessHelper.CmdExecute($"npx electron-builder . --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=9.0.1 {electronParams}", tempPath);
+                ProcessHelper.CmdExecute($"npx electron-builder --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=9.0.3 {electronParams}", tempPath);
 
                 Console.WriteLine("... done");
 

ElectronNET.Host/api/browserWindows.js

@@ -553,6 +553,11 @@ export = (socket: SocketIO.Socket, app: Electron.App) => {
         electronSocket.emit('browserWindow-isKiosk-completed', isKiosk);
     });
 
+    socket.on('browserWindowGetNativeWindowHandle', (id) => {
+      const nativeWindowHandle = getWindowById(id).getNativeWindowHandle().readInt32LE(0).toString(16);
+      electronSocket.emit('browserWindow-getNativeWindowHandle-completed', nativeWindowHandle);
+    });
+
     socket.on('browserWindowSetRepresentedFilename', (id, filename) => {
         getWindowById(id).setRepresentedFilename(filename);
     });

ElectronNET.Host/api/browserWindows.js.map

@@ -53,16 +53,18 @@ export = (socket: SocketIO.Socket) => {
     });
 
     socket.on('create-tray', (image, menuItems) => {
-        const menu = Menu.buildFromTemplate(menuItems);
-
-        addMenuItemClickConnector(menu.items, (id) => {
-            electronSocket.emit('trayMenuItemClicked', id);
-        });
-
         const trayIcon = nativeImage.createFromPath(image);
 
         tray = new Tray(trayIcon);
-        tray.setContextMenu(menu);
+
+        if (menuItems) {
+            const menu = Menu.buildFromTemplate(menuItems);
+    
+            addMenuItemClickConnector(menu.items, (id) => {
+                electronSocket.emit('trayMenuItemClicked', id);
+            });
+            tray.setContextMenu(menu);
+        }
     });
 
     socket.on('tray-destroy', () => {