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

Skip the whole AtomFramelessWindow.

Browse source 
Just round the web view and set the bounds to the window, not the main
view.
This commit is contained in:
Steve Smith 2013-09-12 11:20:38 -04:00
parent 7a1365673e
commit 7a21ae831f
1 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
browser/native_window_mac.mm
View file

@ -100,20 +100,6 @@ static const CGFloat kAtomWindowCornerRadius = 4.0;
@end
@interface AtomFramelessNSWindow : AtomNSWindow
- (void)drawCustomFrameRect:(NSRect)rect forView:(NSView*)view;
@end
@implementation AtomFramelessNSWindow
- (void)drawCustomFrameRect:(NSRect)rect forView:(NSView*)view {
[[NSBezierPath bezierPathWithRect:rect] addClip];
[[NSColor clearColor] set];
NSRectFill(rect);
}
@end
@interface ControlRegionView : NSView {
@private
atom::NativeWindowMac* shellWindow_; // Weak; owns self.
@ -168,24 +154,14 @@ NativeWindowMac::NativeWindowMac(content::WebContents* web_contents,
height);
AtomNSWindow* atomWindow;
NSUInteger style_mask = NSTitledWindowMask | NSClosableWindowMask |
NSMiniaturizableWindowMask | NSResizableWindowMask |
NSTexturedBackgroundWindowMask;
if (has_frame_) {
atomWindow = [[AtomNSWindow alloc]
initWithContentRect:cocoa_bounds
styleMask:style_mask
backing:NSBackingStoreBuffered
defer:YES];
} else {
atomWindow = [[AtomFramelessNSWindow alloc]
initWithContentRect:cocoa_bounds
styleMask:style_mask
backing:NSBackingStoreBuffered
defer:YES];
[atomWindow setOpaque:NO];
[atomWindow setBackgroundColor:[NSColor clearColor]];
}
atomWindow = [[AtomNSWindow alloc]
initWithContentRect:cocoa_bounds
styleMask:NSTitledWindowMask | NSClosableWindowMask |
NSMiniaturizableWindowMask | NSResizableWindowMask |
NSTexturedBackgroundWindowMask
backing:NSBackingStoreBuffered
defer:YES];
[atomWindow setShell:this];
window_ = atomWindow;