Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 47 additions & 3 deletions ui/desktop/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -483,9 +483,8 @@ let appConfig = {

const windowMap = new Map<number, BrowserWindow>();
const goosedClients = new Map<number, Client>();

// Track power save blockers per window
const windowPowerSaveBlockers = new Map<number, number>(); // windowId -> blockerId
const windowPowerSaveBlockers = new Map<number, number>();
const windowAlwaysOnTop = new Map<number, boolean>();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need to keep track in a map?


const createChat = async (
app: App,
Expand Down Expand Up @@ -732,6 +731,7 @@ const createChat = async (
// Handle window closure
mainWindow.on('closed', () => {
windowMap.delete(windowId);
windowAlwaysOnTop.delete(windowId);

if (windowPowerSaveBlockers.has(windowId)) {
const blockerId = windowPowerSaveBlockers.get(windowId)!;
Expand Down Expand Up @@ -1872,6 +1872,50 @@ async function appMain() {
);
}

if (menu) {
let windowMenu = menu.items.find((item) => item.label === 'Window');

if (!windowMenu) {
windowMenu = new MenuItem({
label: 'Window',
submenu: Menu.buildFromTemplate([]),
});

const helpMenuIndex = menu.items.findIndex((item) => item.label === 'Help');
if (helpMenuIndex >= 0) {
menu.items.splice(helpMenuIndex, 0, windowMenu);
} else {
menu.items.push(windowMenu);
}
}

if (windowMenu.submenu) {
windowMenu.submenu.append(
new MenuItem({
label: 'Always on Top',
type: 'checkbox',
accelerator: process.platform === 'darwin' ? 'Cmd+Shift+T' : 'Ctrl+Shift+T',
click(menuItem) {
const focusedWindow = BrowserWindow.getFocusedWindow();
if (focusedWindow) {
const windowId = focusedWindow.id;
const isAlwaysOnTop = menuItem.checked;

if (process.platform === 'darwin') {
focusedWindow.setAlwaysOnTop(isAlwaysOnTop, 'floating');
} else {
focusedWindow.setAlwaysOnTop(isAlwaysOnTop);
}

windowAlwaysOnTop.set(windowId, isAlwaysOnTop);
console.log(`[Main] Set always-on-top to ${isAlwaysOnTop} for window ${windowId}`);
}
},
})
);
}
}

// on macOS, the topbar is hidden
if (menu && process.platform !== 'darwin') {
let helpMenu = menu.items.find((item) => item.label === 'Help');
Expand Down
Loading