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

fix: ensure WebContents before checking draggable region (#41154)

Browse source 
fix: ensure WebContents before checking draggable region
This commit is contained in:
Shelley Vohr 2024-01-30 11:53:19 +01:00 • committed by GitHub
parent ffec3127d5
commit fc917985ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shell/browser/api/electron_api_web_contents_view.cc
View file

@ -81,11 +81,14 @@ void WebContentsView::SetBackgroundColor(std::optional<WrappedSkColor> color) {
} }
int WebContentsView::NonClientHitTest(const gfx::Point& point) { int WebContentsView::NonClientHitTest(const gfx::Point& point) {
gfx::Point local_point(point); if (api_web_contents_) {
views::View::ConvertPointFromWidget(view(), &local_point); gfx::Point local_point(point);
SkRegion* region = api_web_contents_->draggable_region(); views::View::ConvertPointFromWidget(view(), &local_point);
if (region && region->contains(local_point.x(), local_point.y())) SkRegion* region = api_web_contents_->draggable_region();
return HTCAPTION; if (region && region->contains(local_point.x(), local_point.y()))
return HTCAPTION;
}
return HTNOWHERE; return HTNOWHERE;
} }