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

Allow custom window level when sending window to top

Browse source
This commit is contained in:
adammeyer 2016-09-21 13:35:59 -04:00
parent 805ce0dee9
commit fbb3a288ec
7 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -486,8 +486,10 @@ bool Window::IsClosable() {
return window_->IsClosable(); return window_->IsClosable();
} }
void Window::SetAlwaysOnTop(bool top) { void Window::SetAlwaysOnTop(bool top, mate::Arguments* args) {
window_->SetAlwaysOnTop(top); int level = 0;
args->GetNext(&level);
window_->SetAlwaysOnTop(top, level);
} }
bool Window::IsAlwaysOnTop() { bool Window::IsAlwaysOnTop() {

2
atom/browser/api/atom_api_window.h
View file

@ -132,7 +132,7 @@ class Window : public mate::TrackableObject<Window>,
bool IsFullScreenable(); bool IsFullScreenable();
void SetClosable(bool closable); void SetClosable(bool closable);
bool IsClosable(); bool IsClosable();
void SetAlwaysOnTop(bool top); void SetAlwaysOnTop(bool top, mate::Arguments* args);
bool IsAlwaysOnTop(); bool IsAlwaysOnTop();
void Center(); void Center();
void SetPosition(int x, int y, mate::Arguments* args); void SetPosition(int x, int y, mate::Arguments* args);

2
atom/browser/native_window.h
View file

@ -118,7 +118,7 @@ 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) = 0; virtual void SetAlwaysOnTop(bool top, int level = 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;

2
atom/browser/native_window_mac.h
View file

@ -64,7 +64,7 @@ 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) override; void SetAlwaysOnTop(bool top, int level) 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;

7
atom/browser/native_window_mac.mm
View file

@ -943,8 +943,11 @@ bool NativeWindowMac::IsClosable() {
return [window_ styleMask] & NSClosableWindowMask; return [window_ styleMask] & NSClosableWindowMask;
} }
void NativeWindowMac::SetAlwaysOnTop(bool top) { void NativeWindowMac::SetAlwaysOnTop(bool top, int level) {
[window_ setLevel:(top ? NSFloatingWindowLevel : NSNormalWindowLevel)]; if (!level) {
level = NSFloatingWindowLevel;
}
[window_ setLevel:(top ? level : NSNormalWindowLevel)];
} }
bool NativeWindowMac::IsAlwaysOnTop() { bool NativeWindowMac::IsAlwaysOnTop() {

4
atom/browser/native_window_views.cc
View file

@ -682,8 +682,8 @@ bool NativeWindowViews::IsClosable() {
#endif #endif
} }
void NativeWindowViews::SetAlwaysOnTop(bool top) { void NativeWindowViews::SetAlwaysOnTop(bool top, int level) {
window_->SetAlwaysOnTop(top); window_->SetAlwaysOnTop(top, level);
} }
bool NativeWindowViews::IsAlwaysOnTop() { bool NativeWindowViews::IsAlwaysOnTop() {

2
atom/browser/native_window_views.h
View file

@ -84,7 +84,7 @@ 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) override; void SetAlwaysOnTop(bool top, int level) 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;