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

fix: BrowserView drag now delegates to the OS when possible (#31114)

Browse source
This commit is contained in:
Aidan Nulman 2021-09-28 15:12:22 -04:00 • committed by GitHub
parent 4da66b9d68
commit abf6f1cf78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shell/browser/native_browser_view_mac.mm
View file

@ -59,7 +59,8 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask =
} }
- (BOOL)mouseDownCanMoveWindow { - (BOOL)mouseDownCanMoveWindow {
return NO; return
[self.window respondsToSelector:@selector(performWindowDragWithEvent:)];
} }
- (BOOL)acceptsFirstMouse:(NSEvent*)event { - (BOOL)acceptsFirstMouse:(NSEvent*)event {
@ -85,16 +86,15 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask =
- (void)mouseDown:(NSEvent*)event { - (void)mouseDown:(NSEvent*)event {
[super mouseDown:event]; [super mouseDown:event];
if ([self.window respondsToSelector:@selector(performWindowDragWithEvent)]) { if ([self.window respondsToSelector:@selector(performWindowDragWithEvent:)]) {
// According to Google, using performWindowDragWithEvent: // According to Google, using performWindowDragWithEvent:
// does not generate a NSWindowWillMoveNotification. Hence post one. // does not generate a NSWindowWillMoveNotification. Hence post one.
[[NSNotificationCenter defaultCenter] [[NSNotificationCenter defaultCenter]
postNotificationName:NSWindowWillMoveNotification postNotificationName:NSWindowWillMoveNotification
object:self]; object:self];
if (@available(macOS 10.11, *)) {
[self.window performWindowDragWithEvent:event]; [self.window performWindowDragWithEvent:event];
}
return; return;
} }
@ -106,7 +106,7 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask =
} }
- (void)mouseDragged:(NSEvent*)event { - (void)mouseDragged:(NSEvent*)event {
if ([self.window respondsToSelector:@selector(performWindowDragWithEvent)]) { if ([self.window respondsToSelector:@selector(performWindowDragWithEvent:)]) {
return; return;
} }