starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-07-09 02:07:47 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

browserWindows.ts: Fix SetThumbarButtons

Browse Source
This commit is contained in:
softworkz
2025-11-09 02:37:18 +01:00
parent dc27511aa5
commit 8dcc3721eb
3 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ElectronNET.Host/api/browserWindows.js
View File

@@ -524,8 +524,21 @@ module.exports = (socket, app) => {
});
socket.on('browserWindowSetThumbarButtons', (id, thumbarButtons) => {
thumbarButtons.forEach(thumbarButton => {
const imagePath = path.join(__dirname.replace('api', ''), 'bin', thumbarButton.icon.toString());
thumbarButton.icon = electron_1.nativeImage.createFromPath(imagePath);
const originalIconPath = thumbarButton.icon.toString();
const path = require('path');
const fs = require('fs');
let imagePath = originalIconPath;
if (!path.isAbsolute(originalIconPath)) {
imagePath = path.join(__dirname.replace('api', ''), 'bin', originalIconPath);
}
const { nativeImage } = require('electron');
if (fs.existsSync(imagePath)) {
thumbarButton.icon = nativeImage.createFromPath(imagePath);
}
else {
// Fallback to empty image to avoid failure
thumbarButton.icon = nativeImage.createEmpty();
}
thumbarButton.click = () => {
electronSocket.emit('thumbarButtonClicked', thumbarButton['id']);
};
@@ -576,8 +589,14 @@ module.exports = (socket, app) => {
getWindowById(id).setFocusable(focusable);
});
socket.on('browserWindowSetParentWindow', (id, parent) => {
const child = getWindowById(id);
if (!parent) {
// Clear parent: make this window top-level
child.setParentWindow(null);
return;
}
const browserWindow = electron_1.BrowserWindow.fromId(parent.id);
getWindowById(id).setParentWindow(browserWindow);
child.setParentWindow(browserWindow);
});
socket.on('browserWindowGetParentWindow', (id) => {
const browserWindow = getWindowById(id).getParentWindow();

2
src/ElectronNET.Host/api/browserWindows.js.map
View File

File diff suppressed because one or more lines are too long

16
src/ElectronNET.Host/api/browserWindows.ts
View File

@@ -665,8 +665,20 @@ export = (socket: Socket, app: Electron.App) => {
socket.on('browserWindowSetThumbarButtons', (id, thumbarButtons: Electron.ThumbarButton[]) => {
thumbarButtons.forEach(thumbarButton => {
const imagePath = path.join(__dirname.replace('api', ''), 'bin', thumbarButton.icon.toString());
thumbarButton.icon = nativeImage.createFromPath(imagePath);
const originalIconPath = thumbarButton.icon.toString();
const path = require('path');
const fs = require('fs');
let imagePath = originalIconPath;
if (!path.isAbsolute(originalIconPath)) {
imagePath = path.join(__dirname.replace('api', ''), 'bin', originalIconPath);
}
const { nativeImage } = require('electron');
if (fs.existsSync(imagePath)) {
thumbarButton.icon = nativeImage.createFromPath(imagePath);
} else {
// Fallback to empty image to avoid failure
thumbarButton.icon = nativeImage.createEmpty();
}
thumbarButton.click = () => {
electronSocket.emit('thumbarButtonClicked', thumbarButton['id']);
};