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

Save browser_view_ in the NativeWindow

Browse source 
No need to store it separately in subclasses.
This commit is contained in:
Cheng Zhao 2018-03-06 15:04:40 +09:00
parent 503b0ba1b1
commit 3b3e69f8b2
8 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,8 +6,7 @@
#import <Cocoa/Cocoa.h>
#include "atom/browser/native_browser_view_mac.h"
#include "atom/browser/native_window_mac.h"
#include "atom/browser/native_browser_view.h"
#include "atom/common/draggable_region.h"
#include "base/mac/scoped_nsobject.h"
@ -90,9 +89,8 @@ void BrowserWindow::UpdateDraggableRegions(
DraggableRegionsToSkRegion(regions), webViewWidth, webViewHeight);
}
NativeWindowMac* window = static_cast<NativeWindowMac*>(window_.get());
if (window->browser_view())
window->browser_view()->UpdateDraggableRegions(system_drag_exclude_areas);
if (window_->browser_view())
window_->browser_view()->UpdateDraggableRegions(system_drag_exclude_areas);
// Create and add a ControlRegionView for each region that needs to be
// excluded from the dragging.

5
atom/browser/api/atom_api_browser_window_views.cc
View file

@ -4,6 +4,8 @@
#include "atom/browser/api/atom_api_browser_window.h"
#include "atom/browser/native_window_views.h"
namespace atom {
namespace api {
@ -13,7 +15,8 @@ void BrowserWindow::UpdateDraggableRegions(
const std::vector<DraggableRegion>& regions) {
if (window_->has_frame())
return;
window_->UpdateDraggableRegions(DraggableRegionsToSkRegion(regions));
static_cast<NativeWindowViews*>(window_.get())->UpdateDraggableRegions(
DraggableRegionsToSkRegion(regions));
}
} // namespace api