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

fix: draggable regions in BrowserViews are independent (#31085)

Browse source
This commit is contained in:
Shelley Vohr 2021-09-30 11:41:08 +02:00 committed by GitHub
parent 1193a37d8f
commit 2c10d0fe1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
shell/browser/api/electron_api_browser_window_mac.mm
View file

@ -39,10 +39,7 @@ void BrowserWindow::OverrideNSWindowContentView(
void BrowserWindow::UpdateDraggableRegions( void BrowserWindow::UpdateDraggableRegions(
const std::vector<mojom::DraggableRegionPtr>& regions) { const std::vector<mojom::DraggableRegionPtr>& regions) {
if (window_->has_frame()) if (window_->has_frame() || !web_contents())
return;
if (!web_contents())
return; return;
// All ControlRegionViews should be added as children of the WebContentsView, // All ControlRegionViews should be added as children of the WebContentsView,
@ -78,8 +75,13 @@ void BrowserWindow::UpdateDraggableRegions(
DraggableRegionsToSkRegion(regions), webViewWidth, webViewHeight); DraggableRegionsToSkRegion(regions), webViewWidth, webViewHeight);
} }
// Draggable regions on BrowserViews are independent from those of
// BrowserWindows, so if a BrowserView with different draggable regions than
// the BrowserWindow it belongs to is superimposed on top of that window, the
// draggable regions of the BrowserView take precedence over those of the
// BrowserWindow.
for (NativeBrowserView* view : window_->browser_views()) { for (NativeBrowserView* view : window_->browser_views()) {
view->UpdateDraggableRegions(drag_exclude_rects); view->UpdateDraggableRegions(view->GetDraggableRegions());
} }
// Create and add a ControlRegionView for each region that needs to be // Create and add a ControlRegionView for each region that needs to be