mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: implement will-move event on macOS (#19641)

Browse source
This commit is contained in:
Erick Zhao 2019-08-20 07:53:43 -07:00 committed by Shelley Vohr
parent cd1b15a155
commit 145b4fae94
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/api/browser-window.md
View file

@ -516,14 +516,14 @@ Note that this is only emitted when the window is being resized manually. Resizi
Emitted after the window has been resized. Emitted after the window has been resized.
#### Event: 'will-move' _Windows_ #### Event: 'will-move' _macOS_ _Windows_
Returns: Returns:
* `event` Event * `event` Event
* `newBounds` [`Rectangle`](structures/rectangle.md) - Location the window is being moved to. * `newBounds` [`Rectangle`](structures/rectangle.md) - Location the window is being moved to.
Emitted before the window is moved. Calling `event.preventDefault()` will prevent the window from being moved. Emitted before the window is moved. On Windows, calling `event.preventDefault()` will prevent the window from being moved.
Note that this is only emitted when the window is being resized manually. Resizing the window with `setBounds`/`setSize` will not emit this event. Note that this is only emitted when the window is being resized manually. Resizing the window with `setBounds`/`setSize` will not emit this event.

12
shell/browser/ui/cocoa/atom_ns_window_delegate.mm
View file

@ -138,6 +138,18 @@ using TitleBarStyle = electron::NativeWindowMac::TitleBarStyle;
shell_->NotifyWindowResize(); shell_->NotifyWindowResize();
} }
- (void)windowWillMove:(NSNotification*)notification {
NSWindow* window = [notification object];
NSSize size = [[window contentView] frame].size;
NSRect new_bounds = NSMakeRect(window.frame.origin.x, window.frame.origin.y,
size.width, size.height);
bool prevent_default = false;
// prevent_default has no effect
shell_->NotifyWindowWillMove(gfx::ScreenRectFromNSRect(new_bounds),
&prevent_default);
}
- (void)windowDidMove:(NSNotification*)notification { - (void)windowDidMove:(NSNotification*)notification {
[super windowDidMove:notification]; [super windowDidMove:notification];
// TODO(zcbenz): Remove the alias after figuring out a proper // TODO(zcbenz): Remove the alias after figuring out a proper