From d45788a7b8855729917016815543dad3eeeac3f4 Mon Sep 17 00:00:00 2001 From: Felix Rieseberg Date: Tue, 26 Sep 2017 18:03:44 -0400 Subject: [PATCH 1/2] :wrench: Don't drag fullscreen window --- atom/browser/native_browser_view_mac.mm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/atom/browser/native_browser_view_mac.mm b/atom/browser/native_browser_view_mac.mm index 3d77b2a848..4ed9395f96 100644 --- a/atom/browser/native_browser_view_mac.mm +++ b/atom/browser/native_browser_view_mac.mm @@ -47,6 +47,10 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask = return; } + if (([self.window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask) { + return; + } + self.initialLocation = [event locationInWindow]; } @@ -56,6 +60,10 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask = return; } + if (([self.window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask) { + return; + } + NSPoint currentLocation = [NSEvent mouseLocation]; NSPoint newOrigin; From 044a3a29a6fb9f9d235be4d1cf8bb4a329bb4059 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Wed, 27 Sep 2017 16:36:18 +0300 Subject: [PATCH 2/2] Simplify checking for NSFullScreenWindowMask --- atom/browser/native_browser_view_mac.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atom/browser/native_browser_view_mac.mm b/atom/browser/native_browser_view_mac.mm index 4ed9395f96..39d785980a 100644 --- a/atom/browser/native_browser_view_mac.mm +++ b/atom/browser/native_browser_view_mac.mm @@ -47,7 +47,7 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask = return; } - if (([self.window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask) { + if (self.window.styleMask & NSFullScreenWindowMask) { return; } @@ -60,7 +60,7 @@ const NSAutoresizingMaskOptions kDefaultAutoResizingMask = return; } - if (([self.window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask) { + if (self.window.styleMask & NSFullScreenWindowMask) { return; }