fix: draggable regions with devtools open (#29696)

This commit is contained in:
Shelley Vohr 2021-06-16 18:58:30 +02:00 committed by GitHub
parent 6fd9e4280c
commit d59e2d7b2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 9 deletions

View file

@ -5,6 +5,7 @@
#include "shell/browser/api/electron_api_browser_window.h"
#include "shell/browser/native_window_views.h"
#include "ui/aura/window.h"
namespace electron {
@ -14,8 +15,20 @@ void BrowserWindow::UpdateDraggableRegions(
const std::vector<mojom::DraggableRegionPtr>& regions) {
if (window_->has_frame())
return;
if (&draggable_regions_ != &regions) {
auto const offset =
web_contents()->GetNativeView()->GetBoundsInRootWindow();
auto snapped_regions = mojo::Clone(regions);
for (auto& snapped_region : snapped_regions) {
snapped_region->bounds.Offset(offset.x(), offset.y());
}
draggable_regions_ = mojo::Clone(snapped_regions);
}
static_cast<NativeWindowViews*>(window_.get())
->UpdateDraggableRegions(regions);
->UpdateDraggableRegions(draggable_regions_);
}
} // namespace api