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

🔧 Allow dragging over menubar

Browse source
This commit is contained in:
Felix Rieseberg 2017-09-27 17:43:09 -04:00
parent 945fef8a5a
commit 89246f3714
1 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

30
atom/browser/native_browser_view_mac.mm
View file

@ -68,13 +68,41 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask =
NSPoint newOrigin; NSPoint newOrigin;
NSRect screenFrame = [[NSScreen mainScreen] frame]; NSRect screenFrame = [[NSScreen mainScreen] frame];
NSSize screenSize = screenFrame.size;
NSRect windowFrame = [self.window frame]; NSRect windowFrame = [self.window frame];
NSSize windowSize = windowFrame.size;
newOrigin.x = currentLocation.x - self.initialLocation.x; newOrigin.x = currentLocation.x - self.initialLocation.x;
newOrigin.y = currentLocation.y - self.initialLocation.y; newOrigin.y = currentLocation.y - self.initialLocation.y;
BOOL inMenuBar = (newOrigin.y + windowSize.height) > (screenFrame.origin.y + screenSize.height);
BOOL screenAboveMainScreen = false;
if (inMenuBar) {
for (NSScreen *screen in [NSScreen screens]) {
NSRect currentScreenFrame = [screen frame];
BOOL isHigher = currentScreenFrame.origin.y < screenFrame.origin.y;
// 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 let the move pass and allow the window to go underneath the menu bar.
if (isHigher) {
NSPoint aboveLeft = NSMakePoint(
screenFrame.origin.x + screenFrame.size.height + 10, screenFrame.origin.y);
NSPoint aboveRight = NSMakePoint(
screenFrame.origin.x + screenFrame.size.height + 10,
screenFrame.origin.y + screenFrame.size.width);
if (NSPointInRect(aboveLeft, screenFrame) || NSPointInRect(aboveRight, screenFrame)) {
screenAboveMainScreen = true;
break;
}
}
}
}
// Don't let window get dragged up under the menu bar // Don't let window get dragged up under the menu bar
if ((newOrigin.y + windowFrame.size.height) > (screenFrame.origin.y + screenFrame.size.height)) { if (inMenuBar && !screenAboveMainScreen) {
newOrigin.y = screenFrame.origin.y + (screenFrame.size.height - windowFrame.size.height); newOrigin.y = screenFrame.origin.y + (screenFrame.size.height - windowFrame.size.height);
} }