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

throw an error for out of bounds window levels

Browse source
This commit is contained in:
leethomas 2017-01-24 20:08:08 -08:00
parent fb741285c6
commit 1f5518b91e
6 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/native_window_mac.mm
View file

@ -1056,8 +1056,10 @@ bool NativeWindowMac::IsClosable() {
return [window_ styleMask] & NSClosableWindowMask;
}
void NativeWindowMac::SetAlwaysOnTop(bool top, const std::string& level, int relativeLevel) {
void NativeWindowMac::SetAlwaysOnTop(bool top, const std::string& level, int relativeLevel,
std::string* error) {
int windowLevel = NSNormalWindowLevel;
CGWindowLevel maxWindowLevel = CGWindowLevelForKey(kCGMaximumWindowLevelKey);
if (top) {
if (level == "floating") {
@ -1081,10 +1083,12 @@ void NativeWindowMac::SetAlwaysOnTop(bool top, const std::string& level, int rel
}
NSInteger newLevel = windowLevel + relativeLevel;
if (newLevel >= 0 && newLevel < CGWindowLevelForKey(kCGMaximumWindowLevelKey)) {
if (newLevel >= 0 && newLevel <= maxWindowLevel) {
[window_ setLevel:newLevel];
} else {
[window_ setLevel:windowLevel];
*error = std::string([[NSString stringWithFormat:
@"relativeLevel must be between 0 and %d", maxWindowLevel] UTF8String]);
}
}