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

Fix compilation against macOS 10.10 SDK

Browse source
This commit is contained in:
Tony Ganch 2017-03-30 15:13:49 +02:00
parent a7565f0d57
commit bd935b213f
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
atom/browser/native_window_mac.mm
View file

@ -336,6 +336,14 @@ bool ScopedDisableResize::disable_resize_ = false;
@end @end
enum {
NSWindowTabbingModeDisallowed = 2
};
@interface NSWindow (SierraSDK)
- (void)setTabbingMode:(NSInteger)mode;
- (void)setTabbingIdentifier:(NSString *)identifier;
@end
@interface AtomNSWindow : EventDispatchingWindow<QLPreviewPanelDataSource, QLPreviewPanelDelegate, NSTouchBarDelegate> { @interface AtomNSWindow : EventDispatchingWindow<QLPreviewPanelDataSource, QLPreviewPanelDelegate, NSTouchBarDelegate> {
@private @private
atom::NativeWindowMac* shell_; atom::NativeWindowMac* shell_;
@ -656,8 +664,7 @@ NativeWindowMac::NativeWindowMac(
was_fullscreen_(false), was_fullscreen_(false),
zoom_to_page_width_(false), zoom_to_page_width_(false),
attention_request_id_(0), attention_request_id_(0),
title_bar_style_(NORMAL), title_bar_style_(NORMAL) {
tabbing_identifier_(""){
int width = 800, height = 600; int width = 800, height = 600;
options.Get(options::kWidth, &width); options.Get(options::kWidth, &width);
options.Get(options::kHeight, &height); options.Get(options::kHeight, &height);
@ -761,9 +768,13 @@ NativeWindowMac::NativeWindowMac(
// Create a tab only if tabbing identifier is specified and window has // Create a tab only if tabbing identifier is specified and window has
// a native title bar. // a native title bar.
if (tabbing_identifier_.empty() || transparent() || !has_frame()) { if (tabbing_identifier_.empty() || transparent() || !has_frame()) {
[window_ setTabbingMode:NSWindowTabbingModeDisallowed]; if ([window_ respondsToSelector:@selector(tabbingMode)]) {
[window_ setTabbingMode:NSWindowTabbingModeDisallowed];
}
} else { } else {
[window_ setTabbingIdentifier:base::SysUTF8ToNSString(tabbing_identifier_)]; if ([window_ respondsToSelector:@selector(tabbingIdentifier)]) {
[window_ setTabbingIdentifier:base::SysUTF8ToNSString(tabbing_identifier_)];
}
} }
} }