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

Use values directly since constants are 10.11+

Browse source
This commit is contained in:
Kevin Sawicki 2016-11-14 16:06:42 -08:00
parent c2663e48c1
commit dcb3a13361
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
atom/browser/native_window_mac.mm
View file

@ -1212,7 +1212,7 @@ bool NativeWindowMac::IsVisibleOnAllWorkspaces() {
} }
void NativeWindowMac::SetVibrancy(const std::string& type) { void NativeWindowMac::SetVibrancy(const std::string& type) {
if (!(base::mac::IsOSMavericks() || base::mac::IsOSYosemiteOrLater())) return; if (!base::mac::IsOSYosemiteOrLater()) return;
NSView* vibrant_view = [window_ vibrantView]; NSView* vibrant_view = [window_ vibrantView];
@ -1251,19 +1251,27 @@ void NativeWindowMac::SetVibrancy(const std::string& type) {
vibrancyType = NSVisualEffectMaterialTitlebar; vibrancyType = NSVisualEffectMaterialTitlebar;
} }
if (base::mac::IsOSYosemiteOrLater()) { if (base::mac::IsOSElCapitanOrLater()) {
// TODO(kevinsawicki): Use NSVisualEffectMaterial* constants directly once
// they are available in the minimum SDK version
if (type == "selection") { if (type == "selection") {
vibrancyType = NSVisualEffectMaterialSelection; // NSVisualEffectMaterialSelection
vibrancyType = (NSVisualEffectMaterial) 4;
} else if (type == "menu") { } else if (type == "menu") {
vibrancyType = NSVisualEffectMaterialMenu; // NSVisualEffectMaterialMenu
vibrancyType = (NSVisualEffectMaterial) 5;
} else if (type == "popover") { } else if (type == "popover") {
vibrancyType = NSVisualEffectMaterialPopover; // NSVisualEffectMaterialPopover
vibrancyType = (NSVisualEffectMaterial) 6;
} else if (type == "sidebar") { } else if (type == "sidebar") {
vibrancyType = NSVisualEffectMaterialSidebar; // NSVisualEffectMaterialSidebar
vibrancyType = (NSVisualEffectMaterial) 7;
} else if (type == "medium-light") { } else if (type == "medium-light") {
vibrancyType = NSVisualEffectMaterialMediumLight; // NSVisualEffectMaterialMediumLight
vibrancyType = (NSVisualEffectMaterial) 8;
} else if (type == "ultra-dark") { } else if (type == "ultra-dark") {
vibrancyType = NSVisualEffectMaterialUltraDark; // NSVisualEffectMaterialUltraDark
vibrancyType = (NSVisualEffectMaterial) 9;
} }
} }