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

adds test, adds view to AtomNSWindow and minor fixes

Browse source
This commit is contained in:
gellert 2016-11-10 20:36:21 +01:00 • committed by Kevin Sawicki
parent 2cf30c0d63
commit 5e62d28e50
6 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
atom/browser/native_window_mac.mm
View file

@ -311,6 +311,7 @@ bool ScopedDisableResize::disable_resize_ = false;
@property BOOL disableKeyOrMainWindow;
@property NSPoint windowButtonsOffset;
@property (nonatomic, retain) AtomPreviewItem* quickLookItem;
@property (nonatomic, retain) NSView* vibrantView;
- (void)setShell:(atom::NativeWindowMac*)shell;
- (void)setEnableLargerThanScreen:(bool)enable;
@ -743,6 +744,11 @@ NativeWindowMac::NativeWindowMac(
InstallView();
std::string type;
if (options.Get(options::kVibrancyType, &type)) {
SetVibrancy(type);
}
// Set maximizable state last to ensure zoom button does not get reset
// by calls to other APIs.
SetMaximizable(maximizable);
@ -1208,20 +1214,22 @@ bool NativeWindowMac::IsVisibleOnAllWorkspaces() {
void NativeWindowMac::SetVibrancy(const std::string& type) {
if (!(base::mac::IsOSMavericks() || base::mac::IsOSYosemiteOrLater())) return;
if (type.empty()) {
if (vibrant_view_ == nil) return;
NSView* vibrant_view = [window_ vibrantView];
[vibrant_view_ removeFromSuperview];
vibrant_view_ = nil;
if (type.empty()) {
if (vibrant_view == nil) return;
[vibrant_view removeFromSuperview];
[window_ setVibrantView:nil];
return;
}
NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view_;
NSVisualEffectView* effect_view = (NSVisualEffectView*)vibrant_view;
if (effect_view == nil) {
effect_view = [[NSVisualEffectView alloc] initWithFrame:
[[window_ contentView] bounds]];
vibrant_view_ = (NSView*)effect_view;
[window_ setVibrantView:(NSView*)effect_view];
[effect_view setAutoresizingMask:
NSViewWidthSizable | NSViewHeightSizable];