phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed Linux snapping, performance stuff (#2706)

Browse Source
This commit is contained in:
Devin Binnie
2023-05-03 13:09:54 -04:00
committed by GitHub
parent 717544779a
commit 78dc529d32
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/windows/mainWindow.ts
View File

@@ -49,6 +49,7 @@ export class MainWindow extends EventEmitter {
private savedWindowState: SavedWindowState; private savedWindowState: SavedWindowState;
private ready: boolean; private ready: boolean;
private isResizing: boolean; private isResizing: boolean;
private lastEmittedBounds?: Electron.Rectangle
constructor() { constructor() {
super(); super();
@@ -134,7 +135,11 @@ export class MainWindow extends EventEmitter {
this.win.on('leave-full-screen', this.onLeaveFullScreen); this.win.on('leave-full-screen', this.onLeaveFullScreen);
this.win.on('will-resize', this.onWillResize); this.win.on('will-resize', this.onWillResize);
this.win.on('resized', this.onResized); this.win.on('resized', this.onResized);
if (process.platform === 'win32') {
// We don't want this on macOS, it's an alias of 'move'
// This is mostly a fix for Windows 11 snapping
this.win.on('moved', this.onResized); this.win.on('moved', this.onResized);
}
if (process.platform === 'linux') { if (process.platform === 'linux') {
this.win.on('resize', this.onResize); this.win.on('resize', this.onResize);
} }
@@ -407,24 +412,33 @@ export class MainWindow extends EventEmitter {
}); });
} }
private emitBoundsForMaximize = () => { private emitBounds = (bounds?: Electron.Rectangle, force?: boolean) => {
// Workaround since the window bounds aren't updated immediately when the window is maximized for some reason // Workaround since the window bounds aren't updated immediately when the window is maximized for some reason
setTimeout(() => this.emit(MAIN_WINDOW_RESIZED, this.getBounds()), 10); // We also don't want to force too many resizes so we throttle here
setTimeout(() => {
const newBounds = bounds ?? this.getBounds();
if (!force && newBounds?.height === this.lastEmittedBounds?.height && newBounds?.width === this.lastEmittedBounds?.width) {
return;
}
this.emit(MAIN_WINDOW_RESIZED, newBounds);
this.lastEmittedBounds = newBounds;
}, 10);
} }
private onMaximize = () => { private onMaximize = () => {
this.win?.webContents.send(MAXIMIZE_CHANGE, true); this.win?.webContents.send(MAXIMIZE_CHANGE, true);
this.emitBoundsForMaximize(); this.emitBounds();
} }
private onUnmaximize = () => { private onUnmaximize = () => {
this.win?.webContents.send(MAXIMIZE_CHANGE, false); this.win?.webContents.send(MAXIMIZE_CHANGE, false);
this.emitBoundsForMaximize(); this.emitBounds();
} }
private onEnterFullScreen = () => { private onEnterFullScreen = () => {
this.win?.webContents.send('enter-full-screen'); this.win?.webContents.send('enter-full-screen');
this.emitBoundsForMaximize(); this.emitBounds();
// For some reason on Linux I've seen the menu bar popup again // For some reason on Linux I've seen the menu bar popup again
this.win?.setMenuBarVisibility(false); this.win?.setMenuBarVisibility(false);
@@ -432,7 +446,7 @@ export class MainWindow extends EventEmitter {
private onLeaveFullScreen = () => { private onLeaveFullScreen = () => {
this.win?.webContents.send('leave-full-screen'); this.win?.webContents.send('leave-full-screen');
this.emitBoundsForMaximize(); this.emitBounds();
} }
/** /**
@@ -461,7 +475,7 @@ export class MainWindow extends EventEmitter {
} }
this.isResizing = true; this.isResizing = true;
this.emit(MAIN_WINDOW_RESIZED, newBounds); this.emitBounds(newBounds);
} }
private onResize = () => { private onResize = () => {
@@ -471,13 +485,14 @@ export class MainWindow extends EventEmitter {
if (process.platform === 'darwin' && this.isResizing) { if (process.platform === 'darwin' && this.isResizing) {
return; return;
} }
this.emit(MAIN_WINDOW_RESIZED, this.getBounds()); this.emitBounds();
} }
private onResized = () => { private onResized = () => {
log.debug('onResized'); log.debug('onResized');
this.emit(MAIN_WINDOW_RESIZED, this.getBounds()); // Because this is the final window state after a resize, we force the size here
this.emitBounds(this.getBounds(), true);
this.isResizing = false; this.isResizing = false;
} }