Skip to content
This repository was archived by the owner on Dec 27, 2022. It is now read-only.

Commit 2e4d80a

Browse files
committed
Fix window controls on windows
1 parent 6f43e9c commit 2e4d80a

File tree

3 files changed

+29
-10
lines changed

3 files changed

+29
-10
lines changed

app/bg/browser.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ export const WEBAPI = {
189189
setSidebarResizeModeEnabled,
190190
moveWindow,
191191
maximizeWindow,
192+
toggleWindowMaximized,
193+
minimizeWindow,
194+
closeWindow,
192195
resizeSiteInfo,
193196
refreshTabState,
194197

@@ -430,6 +433,25 @@ export async function maximizeWindow () {
430433
win.maximize()
431434
}
432435

436+
async function toggleWindowMaximized () {
437+
var win = findWebContentsParentWindow(this.sender)
438+
if (win.isMaximized()) {
439+
win.unmaximize()
440+
} else {
441+
win.maximize()
442+
}
443+
}
444+
445+
async function minimizeWindow () {
446+
var win = findWebContentsParentWindow(this.sender)
447+
win.minimize()
448+
}
449+
450+
async function closeWindow () {
451+
var win = findWebContentsParentWindow(this.sender)
452+
win.close()
453+
}
454+
433455
export function resizeSiteInfo (bounds) {
434456
var win = findWebContentsParentWindow(this.sender)
435457
if (!win) return

app/bg/web-apis/manifests/internal/browser.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ export default {
4444
setSidebarResizeModeEnabled: 'promise',
4545
moveWindow: 'promise',
4646
maximizeWindow: 'promise',
47+
toggleWindowMaximized: 'promise',
48+
minimizeWindow: 'promise',
49+
closeWindow: 'promise',
4750
resizeSiteInfo: 'promise',
4851
refreshTabState: 'promise',
4952

app/fg/shell-window/win32.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* globals customElements */
22
import { LitElement, html, css } from '../vendor/lit-element/lit-element'
3-
// import * as bg from './bg-process-rpc'
4-
import { remote } from 'electron'
3+
import * as bg from './bg-process-rpc'
54

65
class ShellWindowWin32 extends LitElement {
76
// rendering
@@ -21,20 +20,15 @@ class ShellWindowWin32 extends LitElement {
2120
// =
2221

2322
onClickMinimize () {
24-
remote.getCurrentWindow().minimize()
23+
bg.beakerBrowser.minimizeWindow()
2524
}
2625

2726
onClickMaximize () {
28-
var win = remote.getCurrentWindow()
29-
if (win.isMaximized()) {
30-
win.unmaximize()
31-
} else {
32-
win.maximize()
33-
}
27+
bg.beakerBrowser.toggleWindowMaximized()
3428
}
3529

3630
onClickClose () {
37-
remote.getCurrentWindow().close()
31+
bg.beakerBrowser.closeWindow()
3832
}
3933
}
4034
ShellWindowWin32.styles = css`

0 commit comments

Comments
 (0)