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

fix: draggable region edge calculation on resize (#26233)

Browse source 
* fix: draggable region edge calculation on resize

* Feedback from review
This commit is contained in:
Shelley Vohr 2020-10-29 12:51:56 -07:00 • committed by GitHub
commit e021639472
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shell/browser/api/electron_api_browser_window.cc
View file

@ -14,6 +14,7 @@
#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host.h"
#include "shell/browser/api/electron_api_web_contents_view.h" #include "shell/browser/api/electron_api_web_contents_view.h"
#include "shell/browser/browser.h" #include "shell/browser/browser.h"
#include "shell/browser/native_browser_view.h"
#include "shell/browser/unresponsive_suppressor.h" #include "shell/browser/unresponsive_suppressor.h"
#include "shell/browser/web_contents_preferences.h" #include "shell/browser/web_contents_preferences.h"
#include "shell/browser/window_list.h" #include "shell/browser/window_list.h"
@ -304,8 +305,15 @@ void BrowserWindow::OnWindowIsKeyChanged(bool is_key) {
void BrowserWindow::OnWindowResize() { void BrowserWindow::OnWindowResize() {
#if defined(OS_MAC) #if defined(OS_MAC)
if (!draggable_regions_.empty()) if (!draggable_regions_.empty()) {
UpdateDraggableRegions(draggable_regions_); UpdateDraggableRegions(draggable_regions_);
} else {
// Ensure draggable bounds are recalculated for BrowserViews if any exist.
auto browser_views = window_->browser_views();
for (NativeBrowserView* view : browser_views) {
view->UpdateDraggableRegions(draggable_regions_);
}
}
#endif #endif
BaseWindow::OnWindowResize(); BaseWindow::OnWindowResize();
} }

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

@ -82,8 +82,8 @@ void BrowserWindow::UpdateDraggableRegions(
if ([subview isKindOfClass:[ControlRegionView class]]) if ([subview isKindOfClass:[ControlRegionView class]])
[subview removeFromSuperview]; [subview removeFromSuperview];
// Draggable regions is implemented by having the whole web view draggable // Draggable regions are implemented by having the whole web view draggable
// (mouseDownCanMoveWindow) and overlaying regions that are not draggable. // and overlaying regions that are not draggable.
if (&draggable_regions_ != &regions) { if (&draggable_regions_ != &regions) {
draggable_regions_.clear(); draggable_regions_.clear();
for (const auto& r : regions) for (const auto& r : regions)

2
shell/browser/native_browser_view_mac.h
View file

@ -28,6 +28,8 @@ class NativeBrowserViewMac : public NativeBrowserView {
const std::vector<mojom::DraggableRegionPtr>& regions) override; const std::vector<mojom::DraggableRegionPtr>& regions) override;
private: private:
std::vector<mojom::DraggableRegionPtr> draggable_regions_;
DISALLOW_COPY_AND_ASSIGN(NativeBrowserViewMac); DISALLOW_COPY_AND_ASSIGN(NativeBrowserViewMac);
}; };

19
shell/browser/native_browser_view_mac.mm
View file

@ -206,6 +206,9 @@ void NativeBrowserViewMac::SetBounds(const gfx::Rect& bounds) {
view.frame = view.frame =
NSMakeRect(bounds.x(), superview_height - bounds.y() - bounds.height(), NSMakeRect(bounds.x(), superview_height - bounds.y() - bounds.height(),
bounds.width(), bounds.height()); bounds.width(), bounds.height());
// Ensure draggable regions are properly updated to reflect new bounds.
UpdateDraggableRegions(draggable_regions_);
} }
gfx::Rect NativeBrowserViewMac::GetBounds() { gfx::Rect NativeBrowserViewMac::GetBounds() {
@ -243,8 +246,22 @@ void NativeBrowserViewMac::UpdateDraggableRegions(
NSInteger webViewWidth = NSWidth([web_view bounds]); NSInteger webViewWidth = NSWidth([web_view bounds]);
NSInteger webViewHeight = NSHeight([web_view bounds]); NSInteger webViewHeight = NSHeight([web_view bounds]);
auto drag_exclude_rects = CalculateNonDraggableRegions(
std::vector<gfx::Rect> drag_exclude_rects;
if (regions.empty()) {
drag_exclude_rects.push_back(gfx::Rect(0, 0, webViewWidth, webViewHeight));
} else {
drag_exclude_rects = CalculateNonDraggableRegions(
DraggableRegionsToSkRegion(regions), webViewWidth, webViewHeight); DraggableRegionsToSkRegion(regions), webViewWidth, webViewHeight);
}
// Draggable regions are implemented by having the whole web view draggable
// and overlaying regions that are not draggable.
if (&draggable_regions_ != &regions) {
draggable_regions_.clear();
for (const auto& r : regions)
draggable_regions_.push_back(r.Clone());
}
// Remove all DragRegionViews that were added last time. Note that we need // Remove all DragRegionViews that were added last time. Note that we need
// to copy the `subviews` array to avoid mutation during iteration. // to copy the `subviews` array to avoid mutation during iteration.