fix: don't allow window to go behind menu bar on mac (#22828)

Co-authored-by: Cezary Kulakowski <cezary@openfin.co>
electron · Mar 25, 2020 · 0600420 · 0600420
1 parent a6ff42c
commit 0600420
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/shell/browser/ui/cocoa/electron_ns_window.mm b/shell/browser/ui/cocoa/electron_ns_window.mm
@@ -89,11 +89,11 @@ - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen*)screen {
   if (electron::ScopedDisableResize::IsResizeDisabled())
     return [self frame];
 
+  NSRect result = [super constrainFrameRect:frameRect toScreen:screen];
   // Enable the window to be larger than screen.
   if ([self enableLargerThanScreen])
-    return frameRect;
-  else
-    return [super constrainFrameRect:frameRect toScreen:screen];
+    result.size = frameRect.size;
+  return result;
 }
 
 - (void)setFrame:(NSRect)windowFrame display:(BOOL)displayViews {

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
@@ -1581,10 +1581,16 @@ describe('BrowserWindow module', () => {
   ifdescribe(process.platform === 'darwin')('"enableLargerThanScreen" option', () => {
     afterEach(closeAllWindows);
     it('can move the window out of screen', () => {
+      const w = new BrowserWindow({ show: true, enableLargerThanScreen: true });
+      w.setPosition(-10, 50);
+      const after = w.getPosition();
+      expect(after).to.deep.equal([-10, 50]);
+    });
+    it('cannot move the window behind menu bar', () => {
       const w = new BrowserWindow({ show: true, enableLargerThanScreen: true });
       w.setPosition(-10, -10);
       const after = w.getPosition();
-      expect(after).to.deep.equal([-10, -10]);
+      expect(after[1]).to.be.at.least(0);
     });
     it('without it, cannot move the window out of screen', () => {
       const w = new BrowserWindow({ show: true, enableLargerThanScreen: false });