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

🔧 Allow dragging window to screen above menubar (for real)

Browse source
This commit is contained in:
Felix Rieseberg 2017-09-29 14:20:34 -04:00
parent 89246f3714
commit 0cc1ebc021
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
atom/browser/native_browser_view_mac.mm
View file

@ -43,6 +43,12 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask =
- (void)mouseDown:(NSEvent *)event - (void)mouseDown:(NSEvent *)event
{ {
if ([self.window respondsToSelector:@selector(performWindowDragWithEvent)]) { if ([self.window respondsToSelector:@selector(performWindowDragWithEvent)]) {
// According to Google, using performWindowDragWithEvent:
// does not generate a NSWindowWillMoveNotification. Hence post one.
[[NSNotificationCenter defaultCenter]
postNotificationName:NSWindowWillMoveNotification
object:self];
[self.window performWindowDragWithEvent:event]; [self.window performWindowDragWithEvent:event];
return; return;
} }
@ -81,19 +87,23 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask =
if (inMenuBar) { if (inMenuBar) {
for (NSScreen *screen in [NSScreen screens]) { for (NSScreen *screen in [NSScreen screens]) {
NSRect currentScreenFrame = [screen frame]; NSRect currentScreenFrame = [screen frame];
BOOL isHigher = currentScreenFrame.origin.y < screenFrame.origin.y; BOOL isHigher = currentScreenFrame.origin.y > screenFrame.origin.y;
// If there's another screen that is generally above the current screen, // If there's another screen that is generally above the current screen,
// we'll check if the screen is roughly on the same vertical axis. If so, // we'll draw a new rectangle that is just above the current screen. If the
// we'll let the move pass and allow the window to go underneath the menu bar. // "higher" screen intersects with this rectangle, we'll allow drawing above
// the menubar.
if (isHigher) { if (isHigher) {
NSPoint aboveLeft = NSMakePoint( NSRect aboveScreenRect = NSMakeRect(
screenFrame.origin.x + screenFrame.size.height + 10, screenFrame.origin.y); screenFrame.origin.x,
NSPoint aboveRight = NSMakePoint( screenFrame.origin.y + screenFrame.size.height - 10,
screenFrame.origin.x + screenFrame.size.height + 10, screenFrame.size.width,
screenFrame.origin.y + screenFrame.size.width); 200
);
if (NSPointInRect(aboveLeft, screenFrame) || NSPointInRect(aboveRight, screenFrame)) { BOOL screenAboveIntersects = NSIntersectsRect(currentScreenFrame, aboveScreenRect);
if (screenAboveIntersects) {
screenAboveMainScreen = true; screenAboveMainScreen = true;
break; break;
} }