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

fix: fallback to FullSizeContentView for frameless window on mac (#13599)

Browse source 
fix: draggable regions not working on macOS
This commit is contained in:
Cheng Zhao 2018-07-10 10:43:42 +09:00 • committed by Samuel Attard
parent 28d4f7f25a
commit 0ec4ad288d
5 changed files with 123 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/api/atom_api_browser_window_mac.mm
View file

@ -7,6 +7,7 @@
#import <Cocoa/Cocoa.h>
#include "atom/browser/native_browser_view.h"
#include "atom/browser/native_window_mac.h"
#include "atom/common/draggable_region.h"
#include "base/mac/scoped_nsobject.h"
@ -53,6 +54,17 @@ std::vector<gfx::Rect> CalculateNonDraggableRegions(
} // namespace
void BrowserWindow::OverrideNSWindowContentView() {
// Make NativeWindow use a NSView as content view.
static_cast<NativeWindowMac*>(window())->OverrideNSWindowContentView();
// Add webview to contentView.
NSView* webView = web_contents()->GetNativeView();
NSView* contentView = [window()->GetNativeWindow() contentView];
[webView setFrame:[contentView bounds]];
[contentView addSubview:webView];
[contentView viewDidMoveToWindow];
}
void BrowserWindow::UpdateDraggableRegions(
content::RenderFrameHost* rfh,
const std::vector<DraggableRegion>& regions) {