Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: Fixes linux icons on the taskbar #4806

Merged
hatpick merged 3 commits into from
Nov 13, 2020
Merged

fix: Fixes linux icons on the taskbar #4806

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bfedaf
Fixes linux icons
sorgh Nov 13, 2020
25741b9
Fixes app name on linux on the top panel
hatpick Nov 13, 2020
cbe4c5d
Merge branch 'main' into sorgh/linux_icon
hatpick Nov 13, 2020
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
3 changes: 1 addition & 2 deletions Composer/packages/electron-server/src/electronWindow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { app, BrowserWindow, screen, shell } from 'electron';

import { isLinux } from './utility/platform';
import { isDevelopment } from './utility/env';
import { getUnpackedAsarPath } from './utility/getUnpackedAsarPath';
import logger from './utility/logger';
const log = logger.extend('electron-window');

Expand Down Expand Up @@ -43,7 +42,7 @@ export default class ElectronWindow {
if (isLinux() && !isDevelopment) {
// workaround for broken .AppImage icons since electron-builder@21.0.1 removed .AppImage desktop integration
// (https://github.com/electron-userland/electron-builder/releases/tag/v21.0.1)
browserWindowOptions.icon = join(getUnpackedAsarPath(), 'resources/composerIcon_1024x1024.png');
browserWindowOptions.icon = join(__dirname, '../resources/composerIcon_1024x1024.png');
Comment thread
tonyanziano marked this conversation as resolved.
}
this.currentBrowserWindow = new BrowserWindow(browserWindowOptions);
this.currentBrowserWindow.on('page-title-updated', (ev) => ev.preventDefault()); // preserve explicit window title
Expand Down
1 change: 1 addition & 0 deletions Composer/packages/electron-server/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ async function run() {
const getMainWindow = () => ElectronWindow.getInstance().browserWindow;
const { startApp, updateStatus } = await initSplashScreen({
getMainWindow,
icon: join(__dirname, '../resources/composerIcon_1024x1024.png'),
color: 'rgb(0, 120, 212)',
logo: `file://${microsoftLogoPath}`,
productName: 'Bot Framework Composer',
Expand Down