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

Don't use setMouseDownCanMoveWindow to implement draggable area.

Browse source 
It would not work when we have the in-window devtools.
This commit is contained in:
Cheng Zhao 2013-09-06 11:54:52 +08:00
parent da2ded5453
commit b7c2295a1c
2 changed files with 19 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
browser/native_window_mac.h
View file

@ -56,12 +56,14 @@ class NativeWindowMac : public NativeWindow {
void NotifyWindowBlur() { NativeWindow::NotifyWindowBlur(); }
// Returns true if |point| in local Cocoa coordinate system falls within
// the draggable region.
bool IsWithinDraggableRegion(NSPoint point) const;
// Called to handle a mouse event.
void HandleMouseEvent(NSEvent* event);
NSWindow*& window() { return window_; }
bool use_system_drag() const { return use_system_drag_; }
SkRegion* draggable_region() const { return draggable_region_.get(); }
protected:
@ -77,9 +79,6 @@ class NativeWindowMac : public NativeWindow {
void InstallView();
void UninstallView();
void InstallDraggableRegionViews();
void UpdateDraggableRegionsForSystemDrag(
const std::vector<DraggableRegion>& regions,
const DraggableRegion* draggable_area);
void UpdateDraggableRegionsForCustomDrag(
const std::vector<DraggableRegion>& regions);
@ -89,10 +88,6 @@ class NativeWindowMac : public NativeWindow {
NSInteger attention_request_id_; // identifier from requestUserAttention
// Indicates whether system drag or custom drag should be used, depending on
// the complexity of draggable regions.
bool use_system_drag_;
// For system drag, the whole window is draggable and the non-draggable areas
// have to been explicitly excluded.
std::vector<gfx::Rect> system_drag_exclude_areas_;

135
browser/native_window_mac.mm
View file

@ -154,10 +154,7 @@
}
- (NSView*)hitTest:(NSPoint)aPoint {
if (shellWindow_->use_system_drag())
return nil;
if (!shellWindow_->draggable_region() ||
!shellWindow_->draggable_region()->contains(aPoint.x, aPoint.y)) {
if (!shellWindow_->IsWithinDraggableRegion(aPoint)) {
return nil;
}
return self;
@ -179,8 +176,7 @@ NativeWindowMac::NativeWindowMac(content::WebContents* web_contents,
base::DictionaryValue* options)
: NativeWindow(web_contents, options),
is_kiosk_(false),
attention_request_id_(0),
use_system_drag_(true) {
attention_request_id_(0) {
int width, height;
options->GetInteger(switches::kWidth, &width);
options->GetInteger(switches::kHeight, &height);
@ -222,13 +218,6 @@ NativeWindowMac::NativeWindowMac(content::WebContents* web_contents,
NSView* view = inspectable_web_contents()->GetView()->GetNativeView();
[view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
// By default, the whole frameless window is not draggable.
if (!has_frame_) {
gfx::Rect window_bounds(
0, 0, NSWidth(cocoa_bounds), NSHeight(cocoa_bounds));
system_drag_exclude_areas_.push_back(window_bounds);
}
InstallView();
}
@ -434,6 +423,17 @@ gfx::NativeWindow NativeWindowMac::GetNativeWindow() {
return window();
}
bool NativeWindowMac::IsWithinDraggableRegion(NSPoint point) const {
if (!draggable_region_)
return false;
NSView* webView = web_contents()->GetView()->GetNativeView();
NSInteger webViewHeight = NSHeight([webView bounds]);
// |draggable_region_| is stored in local platform-indepdent coordiate system
// while |point| is in local Cocoa coordinate system. Do the conversion
// to match these two.
return draggable_region_->contains(point.x, webViewHeight - point.y);
}
void NativeWindowMac::HandleMouseEvent(NSEvent* event) {
if ([event type] == NSLeftMouseDown) {
last_mouse_location_ =
@ -455,37 +455,7 @@ void NativeWindowMac::UpdateDraggableRegions(
if (has_frame_)
return;
// To use system drag, the window has to be marked as draggable with
// non-draggable areas being excluded via overlapping views.
// 1) If no draggable area is provided, the window is not draggable at all.
// 2) If only one draggable area is given, as this is the most common
// case, use the system drag. The non-draggable areas that are opposite of
// the draggable area are computed.
// 3) Otherwise, use the custom drag. As such, we lose the capability to
// support some features like snapping into other space.
// Determine how to perform the drag by counting the number of draggable
// areas.
const DraggableRegion* draggable_area = NULL;
use_system_drag_ = true;
for (std::vector<DraggableRegion>::const_iterator iter = regions.begin();
iter != regions.end();
++iter) {
if (iter->draggable) {
// If more than one draggable area is found, use custom drag.
if (draggable_area) {
use_system_drag_ = false;
break;
}
draggable_area = &(*iter);
}
}
if (use_system_drag_)
UpdateDraggableRegionsForSystemDrag(regions, draggable_area);
else
UpdateDraggableRegionsForCustomDrag(regions);
UpdateDraggableRegionsForCustomDrag(regions);
InstallDraggableRegionViews();
}
@ -504,14 +474,10 @@ void NativeWindowMac::HandleKeyboardEvent(
void NativeWindowMac::InstallView() {
NSView* view = inspectable_web_contents()->GetView()->GetNativeView();
NSView* web_view = GetWebContents()->GetView()->GetNativeView();
if (has_frame_) {
[view setFrame:[[window() contentView] bounds]];
[[window() contentView] addSubview:view];
} else {
DCHECK([web_view respondsToSelector:@selector(setMouseDownCanMoveWindow:)]);
[web_view setMouseDownCanMoveWindow:YES];
NSView* frameView = [[window() contentView] superview];
[view setFrame:[frameView bounds]];
[frameView addSubview:view];
@ -520,13 +486,11 @@ void NativeWindowMac::InstallView() {
[[window() standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
[[window() standardWindowButton:NSWindowCloseButton] setHidden:YES];
[[window() standardWindowButton:NSWindowFullScreenButton] setHidden:YES];
InstallDraggableRegionViews();
}
}
void NativeWindowMac::UninstallView() {
NSView* view = GetWebContents()->GetView()->GetNativeView();
NSView* view = inspectable_web_contents()->GetView()->GetNativeView();
[view removeFromSuperview];
}
@ -564,74 +528,6 @@ void NativeWindowMac::InstallDraggableRegionViews() {
}
}
void NativeWindowMac::UpdateDraggableRegionsForSystemDrag(
const std::vector<DraggableRegion>& regions,
const DraggableRegion* draggable_area) {
NSView* web_view = GetWebContents()->GetView()->GetNativeView();
NSInteger web_view_width = NSWidth([web_view bounds]);
NSInteger web_view_height = NSHeight([web_view bounds]);
system_drag_exclude_areas_.clear();
// The whole window is not draggable if no draggable area is given.
if (!draggable_area) {
gfx::Rect window_bounds(0, 0, web_view_width, web_view_height);
system_drag_exclude_areas_.push_back(window_bounds);
return;
}
// Otherwise, there is only one draggable area. Compute non-draggable areas
// that are the opposite of the given draggable area, combined with the
// remaining provided non-draggable areas.
// Copy all given non-draggable areas.
for (std::vector<DraggableRegion>::const_iterator iter = regions.begin();
iter != regions.end();
++iter) {
if (!iter->draggable)
system_drag_exclude_areas_.push_back(iter->bounds);
}
gfx::Rect draggable_bounds = draggable_area->bounds;
gfx::Rect non_draggable_bounds;
// Add the non-draggable area above the given draggable area.
if (draggable_bounds.y() > 0) {
non_draggable_bounds.SetRect(0,
0,
web_view_width,
draggable_bounds.y() - 1);
system_drag_exclude_areas_.push_back(non_draggable_bounds);
}
// Add the non-draggable area below the given draggable area.
if (draggable_bounds.bottom() < web_view_height) {
non_draggable_bounds.SetRect(0,
draggable_bounds.bottom() + 1,
web_view_width,
web_view_height - draggable_bounds.bottom());
system_drag_exclude_areas_.push_back(non_draggable_bounds);
}
// Add the non-draggable area to the left of the given draggable area.
if (draggable_bounds.x() > 0) {
non_draggable_bounds.SetRect(0,
draggable_bounds.y(),
draggable_bounds.x() - 1,
draggable_bounds.height());
system_drag_exclude_areas_.push_back(non_draggable_bounds);
}
// Add the non-draggable area to the right of the given draggable area.
if (draggable_bounds.right() < web_view_width) {
non_draggable_bounds.SetRect(draggable_bounds.right() + 1,
draggable_bounds.y(),
web_view_width - draggable_bounds.right(),
draggable_bounds.height());
system_drag_exclude_areas_.push_back(non_draggable_bounds);
}
}
void NativeWindowMac::UpdateDraggableRegionsForCustomDrag(
const std::vector<DraggableRegion>& regions) {
// We still need one ControlRegionView to cover the whole window such that
@ -659,7 +555,6 @@ void NativeWindowMac::UpdateDraggableRegionsForCustomDrag(
draggable_region_.reset(draggable_region);
}
// static
NativeWindow* NativeWindow::Create(content::WebContents* web_contents,
base::DictionaryValue* options) {