Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/eez-open/studio
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Nov 10, 2024
2 parents b5bfb5e + 373da07 commit 65faa6d
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion packages/main/window.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { action, observable, runInAction } from "mobx";

import { getIcon } from "main/util";
import {
settings,
settingsRegisterWindow,
settingsSetWindowBoundsIntoParams
} from "main/settings";
Expand Down Expand Up @@ -81,8 +82,10 @@ export function createWindow(params: IWindowParams) {

if (!showHidden) {
settingsSetWindowBoundsIntoParams(params.url, windowContructorParams);

windowContructorParams.icon = getIcon();
if (settings.isDarkTheme) {
windowContructorParams.backgroundColor = "#212529";
}
}

let browserWindow = new BrowserWindow(windowContructorParams);
Expand Down Expand Up @@ -120,6 +123,10 @@ export function createWindow(params: IWindowParams) {
if (!showHidden) {
browserWindow.show();

// browserWindow.once("ready-to-show", () => {
// browserWindow.show();
// });

if (!params.utilityWindow) {
browserWindow.on("close", function (event: any) {
if (isCrashed(browserWindow)) {
Expand Down

0 comments on commit 65faa6d

Please sign in to comment.