Skip to content

fix: no windows resize after listen call close #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tonyco97 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: no windows resize after listen call close #192

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 28 additions & 4 deletions src/main/classes/windows/NethLinkWindow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { AccountController } from '../controllers'
export class NethLinkWindow extends BaseWindow {
static instance: NethLinkWindow
size: { w: number; h: number } | undefined
private _programmaticBoundsUntil = 0
constructor() {
super(PAGES.NETHLINK, {
width: NethLinkPageSize.w,
Expand Down Expand Up @@ -41,6 +42,11 @@ export class NethLinkWindow extends BaseWindow {
NethLinkWindow.instance = this
}

private _applyBounds(bounds: Electron.Rectangle) {
this._programmaticBoundsUntil = Date.now() + 1500
this._window?.setBounds(bounds, false)
}

_setBounds() {
try {
const MARGIN = 8
Expand All @@ -62,7 +68,7 @@ export class NethLinkWindow extends BaseWindow {
y = screenBounds.y + MACBARHEIGHT + MARGIN
}
const nethlinkBounds: Electron.Rectangle = { x, y, width: w, height: h }
this._window?.setBounds(nethlinkBounds, false)
this._applyBounds(nethlinkBounds)
} catch (e) {
Log.warning('during update bounds of the NethLinkWindow:', e)
}
Expand All @@ -78,12 +84,12 @@ export class NethLinkWindow extends BaseWindow {
result ||
(accountBounds.x >= area.x &&
accountBounds.y >= area.y &&
(accountBounds.x + accountBounds.width) < (area.x + area.width) &&
(accountBounds.y + accountBounds.height) < (area.y + area.height))
(accountBounds.x + accountBounds.width) <= (area.x + area.width) &&
(accountBounds.y + accountBounds.height) <= (area.y + area.height))
)
}, false)
if (isAccountBoundsOnDisplay) {
this._window?.setBounds(accountBounds, false)
this._applyBounds(accountBounds)
} else {
this._setBounds()
}
Expand Down Expand Up @@ -115,6 +121,9 @@ export class NethLinkWindow extends BaseWindow {
}

saveBounds(bounds: Electron.Rectangle | undefined = undefined) {
if (this._window?.isMaximized() || this._window?.isFullScreen()) {
return
}
const nethlinkBounds = bounds || this._window?.getBounds()
AccountController.instance.setAccountNethLinkBounds(nethlinkBounds)
}
Expand All @@ -125,6 +134,21 @@ export class NethLinkWindow extends BaseWindow {
this._window?.on('moved', () => {
debouncer('onMoveNethLinkWindow', () => this.saveBounds(), 1000)
})
this._window?.on('resize', () => {
if (Date.now() < this._programmaticBoundsUntil) {
return
}
debouncer('onMoveNethLinkWindow', () => {
if (!this._window || this._window.isDestroyed() || this._window.isMinimized() || !this._window.isVisible()) {
return
}
const bounds = this._window.getBounds()
if (bounds.width < NethLinkPageSize.w || bounds.height < NethLinkPageSize.h) {
return
}
this.saveBounds(bounds)
}, 1000)
})
this._window?.on('show', this.toggleVisibility)
this._window?.on('closed', this.toggleVisibility)
this._window?.on('close', (e) => {
Expand Down
Loading