Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
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
3 changes: 1 addition & 2 deletions Composer/packages/electron-server/src/electronWindow.ts
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 [email protected] 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');
}
this.currentBrowserWindow = new BrowserWindow(browserWindowOptions);
this.currentBrowserWindow.on('page-title-updated', (ev) => ev.preventDefault()); // preserve explicit window title
Expand Down
13 changes: 9 additions & 4 deletions Composer/packages/electron-server/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ import { AppUpdaterSettings, UserSettings } from '@bfc/shared';
import { app, ipcMain } from 'electron';
import { UpdateInfo } from 'electron-updater';
import fixPath from 'fix-path';
import { mkdirp } from 'fs-extra';
import formatMessage from 'format-message';
import { mkdirp } from 'fs-extra';

import { initAppMenu } from './appMenu';
import { AppUpdater } from './appUpdater';
import { OneAuthService } from './auth/oneAuthService';
import { composerProtocol } from './constants';
import ElectronWindow from './electronWindow';
import { initSplashScreen } from './splash/splashScreen';
import { isDevelopment } from './utility/env';
import { getUnpackedAsarPath } from './utility/getUnpackedAsarPath';
import { loadLocale, getAppLocale, updateAppLocale } from './utility/locale';
import { getAppLocale, loadLocale, updateAppLocale } from './utility/locale';
import log from './utility/logger';
import { isMac, isWindows } from './utility/platform';
import { isLinux, isMac, isWindows } from './utility/platform';
import { parseDeepLinkUrl } from './utility/url';
import { OneAuthService } from './auth/oneAuthService';

const env = log.extend('env');
env('%O', process.env);
Expand Down Expand Up @@ -50,6 +50,10 @@ const getBaseUrl = () => {
// set production flag
if (app.isPackaged) {
process.env.NODE_ENV = 'production';
// Windows and Mac use the window title as the app name, but some linux distributions use package name, this will fix that.
if (isLinux()) {
app.setName('Bot Framework Composer');
}
}
log(`${process.env.NODE_ENV} environment detected.`);

Expand Down Expand Up @@ -249,6 +253,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