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

Fix compiler errors

Browse source
This commit is contained in:
Kevin Sawicki 2016-09-22 09:22:28 -07:00
parent 783d47f78b
commit bce62622bb
2 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/native_window.h
View file

@ -118,7 +118,8 @@ class NativeWindow : public base::SupportsUserData,
virtual bool IsFullScreenable() = 0; virtual bool IsFullScreenable() = 0;
virtual void SetClosable(bool closable) = 0; virtual void SetClosable(bool closable) = 0;
virtual bool IsClosable() = 0; virtual bool IsClosable() = 0;
virtual void SetAlwaysOnTop(bool top, const std::string& level) = 0; virtual void SetAlwaysOnTop(bool top,
const std::string& level = "floating") = 0;
virtual bool IsAlwaysOnTop() = 0; virtual bool IsAlwaysOnTop() = 0;
virtual void Center() = 0; virtual void Center() = 0;
virtual void SetTitle(const std::string& title) = 0; virtual void SetTitle(const std::string& title) = 0;

42
atom/browser/native_window_mac.mm
View file

@ -943,28 +943,28 @@ bool NativeWindowMac::IsClosable() {
return [window_ styleMask] & NSClosableWindowMask; return [window_ styleMask] & NSClosableWindowMask;
} }
void NativeWindowMac::SetAlwaysOnTop(bool top, std::string level) { void NativeWindowMac::SetAlwaysOnTop(bool top, const std::string& level) {
int intLevel; int windowLevel = NSNormalWindowLevel;
if (level == "normal") { if (top) {
intLevel = NSNormalWindowLevel; if (level == "floating") {
} else if (level == "floating") { windowLevel = NSFloatingWindowLevel;
intLevel = NSFloatingWindowLevel; } else if (level == "torn-off-menu") {
} else if (level == "torn-off-menu") { windowLevel = NSTornOffMenuWindowLevel;
intLevel = NSTornOffMenuWindowLevel; } else if (level == "modal-panel") {
} else if (level == "modal-panel") { windowLevel = NSModalPanelWindowLevel;
intLevel = NSModalPanelWindowLevel; } else if (level == "main-menu") {
} else if (level == "main-menu") { windowLevel = NSMainMenuWindowLevel;
intLevel = NSMainMenuWindowLevel; } else if (level == "status") {
} else if (level == "status") { windowLevel = NSStatusWindowLevel;
intLevel = NSStatusWindowLevel; } else if (level == "pop-up-menu") {
} else if (level == "pop-up-menu") { windowLevel = NSPopUpMenuWindowLevel;
intLevel = NSPopUpMenuWindowLevel; } else if (level == "screen-saver") {
} else if (level == "screen-saver") { windowLevel = NSScreenSaverWindowLevel;
intLevel = NSScreenSaverWindowLevel; } else if (level == "dock") {
} else if (level == "dock") { windowLevel = NSDockWindowLevel;
intLevel = NSDockWindowLevel; }
} }
[window_ setLevel:(top ? intLevel : NSNormalWindowLevel)]; [window_ setLevel:windowLevel];
} }
bool NativeWindowMac::IsAlwaysOnTop() { bool NativeWindowMac::IsAlwaysOnTop() {