Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
45 changes: 45 additions & 0 deletions main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,17 @@ function getTrayIcon(): string {
}
}

function createTaskbarButtonIcon(name: 'play' | 'pause' | 'next' | 'previous') {
const iconFileName: Record<'play' | 'pause' | 'next' | 'previous', string> = {
play: 'taskbar_play.ico',
pause: 'taskbar_pause.ico',
next: 'taskbar_next.ico',
previous: 'taskbar_previous.ico',
};

return nativeImage.createFromPath(path.join(globalAny.__static, `icons/${iconFileName[name]}`));
}

function setInitialWindowState(mainWindow: BrowserWindow): void {
try {
let windowPositionSizeMaximizedAsString: string = settings.get('fullPlayerPositionSizeMaximized');
Expand Down Expand Up @@ -612,6 +623,40 @@ try {
});

ipcMain.on('update-dock-menu', (event: any, arg: any) => {
if (isWindows() && mainWindow) {
mainWindow.setThumbarButtons([
{
tooltip: arg.previousLabel,
icon: createTaskbarButtonIcon('previous'),
click(): void {
if (mainWindow) {
mainWindow.webContents.send('dock-previous');
}
},
},
{
tooltip: arg.playPauseLabel,
icon: createTaskbarButtonIcon(arg.isPlaying ? 'pause' : 'play'),
click(): void {
if (mainWindow) {
mainWindow.webContents.send('dock-play-pause');
}
},
},
{
tooltip: arg.nextLabel,
icon: createTaskbarButtonIcon('next'),
click(): void {
if (mainWindow) {
mainWindow.webContents.send('dock-next');
}
},
},
]);

return;
}

if (!isMacOS() || !app.dock) {
return;
}
Expand Down
15 changes: 9 additions & 6 deletions src/app/services/dock/dock.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ export class DockService {
return process.platform === 'darwin';
}

public get isWindows(): boolean {
return process.platform === 'win32';
}

public get showAlbumArtOnDockIcon(): boolean {
return this.settings.showAlbumArtOnDockIcon;
}
Expand All @@ -40,19 +44,19 @@ export class DockService {
}

public initialize(): void {
if (!this.isMacOS) {
if (!this.isMacOS && !this.isWindows) {
return;
}

this.removeSubscriptions();

if (this.settings.showAlbumArtOnDockIcon) {
if (this.isMacOS && this.settings.showAlbumArtOnDockIcon) {
this.addSubscriptions();

if (this.playbackService.currentTrack != undefined) {
this.updateDockIconAsync(this.playbackService.currentTrack);
}
} else {
} else if (this.isMacOS) {
this.resetDockIcon();
}

Expand Down Expand Up @@ -194,12 +198,11 @@ export class DockService {
}

private updateDockMenu(): void {
const playPauseLabel = this.playbackService.canPause
? this.translatorService.get('pause')
: this.translatorService.get('play');
const playPauseLabel = this.playbackService.canPause ? this.translatorService.get('pause') : this.translatorService.get('play');

const arg = {
playPauseLabel: playPauseLabel,
isPlaying: this.playbackService.canPause,
nextLabel: this.translatorService.get('next'),
previousLabel: this.translatorService.get('previous'),
};
Expand Down
Binary file added static/icons/taskbar_next.ico
Binary file not shown.
Binary file added static/icons/taskbar_pause.ico
Binary file not shown.
Binary file added static/icons/taskbar_play.ico
Binary file not shown.
Binary file added static/icons/taskbar_previous.ico
Binary file not shown.
Loading