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

implement relative window levels, closes #8153

Browse source
This commit is contained in:
leethomas 2017-01-23 20:36:09 -08:00
parent 91ed9aeeee
commit 7a0a87a6f3
6 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_window.cc
View file

@ -512,8 +512,10 @@ bool Window::IsClosable() {
void Window::SetAlwaysOnTop(bool top, mate::Arguments* args) { void Window::SetAlwaysOnTop(bool top, mate::Arguments* args) {
std::string level = "floating"; std::string level = "floating";
int relativeLevel = 0;
args->GetNext(&level); args->GetNext(&level);
window_->SetAlwaysOnTop(top, level); args->GetNext(&relativeLevel);
window_->SetAlwaysOnTop(top, level, relativeLevel);
} }
bool Window::IsAlwaysOnTop() { bool Window::IsAlwaysOnTop() {

3
atom/browser/native_window.h
View file

@ -119,7 +119,8 @@ class NativeWindow : public base::SupportsUserData,
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, virtual void SetAlwaysOnTop(bool top,
const std::string& level = "floating") = 0; const std::string& level = "floating",
int relativeLevel = 0) = 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;

3
atom/browser/native_window_mac.h
View file

@ -67,7 +67,8 @@ class NativeWindowMac : public NativeWindow,
bool IsFullScreenable() override; bool IsFullScreenable() override;
void SetClosable(bool closable) override; void SetClosable(bool closable) override;
bool IsClosable() override; bool IsClosable() override;
void SetAlwaysOnTop(bool top, const std::string& level) override; void SetAlwaysOnTop(bool top, const std::string& level,
int relativeLevel) override;
bool IsAlwaysOnTop() override; bool IsAlwaysOnTop() override;
void Center() override; void Center() override;
void SetTitle(const std::string& title) override; void SetTitle(const std::string& title) override;

9
atom/browser/native_window_mac.mm
View file

@ -1056,8 +1056,9 @@ bool NativeWindowMac::IsClosable() {
return [window_ styleMask] & NSClosableWindowMask; return [window_ styleMask] & NSClosableWindowMask;
} }
void NativeWindowMac::SetAlwaysOnTop(bool top, const std::string& level) { void NativeWindowMac::SetAlwaysOnTop(bool top, const std::string& level, int relativeLevel) {
int windowLevel = NSNormalWindowLevel; int windowLevel = NSNormalWindowLevel;
if (top) { if (top) {
if (level == "floating") { if (level == "floating") {
windowLevel = NSFloatingWindowLevel; windowLevel = NSFloatingWindowLevel;
@ -1078,8 +1079,14 @@ void NativeWindowMac::SetAlwaysOnTop(bool top, const std::string& level) {
windowLevel = NSDockWindowLevel; windowLevel = NSDockWindowLevel;
} }
} }
NSInteger newLevel = windowLevel + relativeLevel;
if (newLevel >= 0 && newLevel < CGWindowLevelForKey(kCGMaximumWindowLevelKey)) {
[window_ setLevel:newLevel];
} else {
[window_ setLevel:windowLevel]; [window_ setLevel:windowLevel];
} }
}
bool NativeWindowMac::IsAlwaysOnTop() { bool NativeWindowMac::IsAlwaysOnTop() {
return [window_ level] != NSNormalWindowLevel; return [window_ level] != NSNormalWindowLevel;

3
atom/browser/native_window_views.cc
View file

@ -682,7 +682,8 @@ bool NativeWindowViews::IsClosable() {
#endif #endif
} }
void NativeWindowViews::SetAlwaysOnTop(bool top, const std::string& level) { void NativeWindowViews::SetAlwaysOnTop(bool top, const std::string& level,
int relativeLevel) {
window_->SetAlwaysOnTop(top); window_->SetAlwaysOnTop(top);
} }

3
atom/browser/native_window_views.h
View file

@ -86,7 +86,8 @@ class NativeWindowViews : public NativeWindow,
bool IsFullScreenable() override; bool IsFullScreenable() override;
void SetClosable(bool closable) override; void SetClosable(bool closable) override;
bool IsClosable() override; bool IsClosable() override;
void SetAlwaysOnTop(bool top, const std::string& level) override; void SetAlwaysOnTop(bool top, const std::string& level,
int relativeLevel) override;
bool IsAlwaysOnTop() override; bool IsAlwaysOnTop() override;
void Center() override; void Center() override;
void SetTitle(const std::string& title) override; void SetTitle(const std::string& title) override;