diff options
author | Kristóf Marussy <kristof@marussy.com> | 2022-04-14 15:49:52 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2022-05-16 00:55:00 +0200 |
commit | 7e34607793a044bcf5ca3ce471f99859bc6cf636 (patch) | |
tree | 777147cb562b15ceac4e15a5182110a4df6f27e5 /packages/main | |
parent | chore(deps): Bump dependencies (diff) | |
download | sophie-7e34607793a044bcf5ca3ce471f99859bc6cf636.tar.gz sophie-7e34607793a044bcf5ca3ce471f99859bc6cf636.tar.zst sophie-7e34607793a044bcf5ca3ce471f99859bc6cf636.zip |
chore(deps): Bump electron to 19 for setBackgroundColor fix
Since https://github.com/electron/electron/pull/33435 has landed in
electron 19 alpha, but not in 18, moving to 19 lets us remove the
workarounds for setBackgroundColor.
Signed-off-by: Kristóf Marussy <kristof@marussy.com>
Diffstat (limited to 'packages/main')
-rw-r--r-- | packages/main/package.json | 2 | ||||
-rw-r--r-- | packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts | 1 | ||||
-rw-r--r-- | packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/packages/main/package.json b/packages/main/package.json index 4ebc994..b8e00c8 100644 --- a/packages/main/package.json +++ b/packages/main/package.json | |||
@@ -12,7 +12,7 @@ | |||
12 | "@sophie/shared": "workspace:*", | 12 | "@sophie/shared": "workspace:*", |
13 | "chalk": "^5.0.1", | 13 | "chalk": "^5.0.1", |
14 | "deep-equal": "^2.0.5", | 14 | "deep-equal": "^2.0.5", |
15 | "electron": "18.0.3", | 15 | "electron": "^19.0.0-alpha.1", |
16 | "fs-extra": "^10.0.1", | 16 | "fs-extra": "^10.0.1", |
17 | "i18next": "^21.6.16", | 17 | "i18next": "^21.6.16", |
18 | "json5": "^2.2.1", | 18 | "json5": "^2.2.1", |
diff --git a/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts b/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts index 6144d89..edc6592 100644 --- a/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts +++ b/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts | |||
@@ -153,7 +153,6 @@ export default class ElectronMainWindow implements MainWindow { | |||
153 | } | 153 | } |
154 | if (serviceView instanceof ElectronServiceView) { | 154 | if (serviceView instanceof ElectronServiceView) { |
155 | this.browserWindow.setBrowserView(serviceView.browserView); | 155 | this.browserWindow.setBrowserView(serviceView.browserView); |
156 | serviceView.browserView.setBackgroundColor('#fff'); | ||
157 | return; | 156 | return; |
158 | } | 157 | } |
159 | throw new TypeError( | 158 | throw new TypeError( |
diff --git a/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts b/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts index 340c523..2e64269 100644 --- a/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts +++ b/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts | |||
@@ -55,6 +55,8 @@ export default class ElectronServiceView implements ServiceView { | |||
55 | }, | 55 | }, |
56 | }); | 56 | }); |
57 | 57 | ||
58 | this.browserView.setBackgroundColor('#fff'); | ||
59 | |||
58 | const { webContents } = this.browserView; | 60 | const { webContents } = this.browserView; |
59 | 61 | ||
60 | function setLocation(url: string) { | 62 | function setLocation(url: string) { |