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

Rename system_drag_exclude_areas => drag_exclude_rects

Browse source
This commit is contained in:
Birunthan Mohanathas 2018-03-19 13:21:03 +02:00
parent 61160ff9e5
commit 377e6c3210
2 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/native_browser_view_mac.mm
View file

@ -194,7 +194,7 @@ void NativeBrowserViewMac::SetBackgroundColor(SkColor color) {
}
void NativeBrowserViewMac::UpdateDraggableRegions(
const std::vector<gfx::Rect>& system_drag_exclude_areas) {
const std::vector<gfx::Rect>& drag_exclude_rects) {
NSView* webView = GetInspectableWebContentsView()->GetNativeView();
NSInteger superViewHeight = NSHeight([webView.superview bounds]);
@ -230,15 +230,13 @@ void NativeBrowserViewMac::UpdateDraggableRegions(
webViewHeight)];
// Then, on top of that, add "exclusion zones"
for (auto iter = system_drag_exclude_areas.begin();
iter != system_drag_exclude_areas.end();
++iter) {
for (const auto& rect : drag_exclude_rects) {
base::scoped_nsobject<NSView> controlRegion(
[[ExcludeDragRegionView alloc] initWithFrame:NSZeroRect]);
[controlRegion setFrame:NSMakeRect(iter->x() - webViewX,
webViewHeight - iter->bottom() + webViewY,
iter->width(),
iter->height())];
[controlRegion setFrame:NSMakeRect(rect.x() - webViewX,
webViewHeight - rect.bottom() + webViewY,
rect.width(),
rect.height())];
[dragRegion addSubview:controlRegion];
}