feat: add evt listeners for SetAlwaysOnTop

electron · Oct 3, 2018 · 26a009c · 26a009c
1 parent a1b2162
commit 26a009c
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 0 deletions.
diff --git a/atom/browser/api/atom_api_top_level_window.cc b/atom/browser/api/atom_api_top_level_window.cc
@@ -262,6 +262,14 @@ void TopLevelWindow::OnWindowLeaveHtmlFullScreen() {
   Emit("leave-html-full-screen");
 }
 
+void TopLevelWindow::OnWindowEnterAlwaysOnTop() {
+  Emit("enter-always-on-top");
+}
+
+void TopLevelWindow::OnWindowLeaveAlwaysOnTop() {
+  Emit("leave-always-on-top");
+}
+
 void TopLevelWindow::OnExecuteWindowsCommand(const std::string& command_name) {
   Emit("app-command", command_name);
 }

diff --git a/atom/browser/api/atom_api_top_level_window.h b/atom/browser/api/atom_api_top_level_window.h
@@ -77,6 +77,8 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
   void OnWindowLeaveFullScreen() override;
   void OnWindowEnterHtmlFullScreen() override;
   void OnWindowLeaveHtmlFullScreen() override;
+  void OnWindowEnterAlwaysOnTop() override;
+  void OnWindowLeaveAlwaysOnTop() override;
   void OnExecuteWindowsCommand(const std::string& command_name) override;
   void OnTouchBarItemResult(const std::string& item_id,
                             const base::DictionaryValue& details) override;

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
@@ -537,6 +537,16 @@ void NativeWindow::NotifyWindowLeaveHtmlFullScreen() {
     observer.OnWindowLeaveHtmlFullScreen();
 }
 
+void NativeWindow::NotifyWindowEnterAlwaysOnTop() {
+  for (NativeWindowObserver& observer : observers_)
+    observer.OnWindowEnterAlwaysOnTop();
+}
+
+void NativeWindow::NotifyWindowLeaveAlwaysOnTop() {
+  for (NativeWindowObserver& observer : observers_)
+    observer.OnWindowLeaveAlwaysOnTop();
+}
+
 void NativeWindow::NotifyWindowExecuteWindowsCommand(
     const std::string& command) {
   for (NativeWindowObserver& observer : observers_)

diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
@@ -254,6 +254,8 @@ class NativeWindow : public base::SupportsUserData,
   void NotifyWindowLeaveFullScreen();
   void NotifyWindowEnterHtmlFullScreen();
   void NotifyWindowLeaveHtmlFullScreen();
+  void NotifyWindowEnterAlwaysOnTop();
+  void NotifyWindowLeaveAlwaysOnTop();
   void NotifyWindowExecuteWindowsCommand(const std::string& command);
   void NotifyTouchBarItemInteraction(const std::string& item_id,
                                      const base::DictionaryValue& details);

diff --git a/atom/browser/native_window_observer.h b/atom/browser/native_window_observer.h
@@ -83,6 +83,8 @@ class NativeWindowObserver {
   virtual void OnWindowLeaveFullScreen() {}
   virtual void OnWindowEnterHtmlFullScreen() {}
   virtual void OnWindowLeaveHtmlFullScreen() {}
+  virtual void OnWindowEnterAlwaysOnTop() {}
+  virtual void OnWindowLeaveAlwaysOnTop() {}
   virtual void OnTouchBarItemResult(const std::string& item_id,
                                     const base::DictionaryValue& details) {}
   virtual void OnNewWindowForTab() {}

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
@@ -706,6 +706,12 @@ void NativeWindowViews::SetAlwaysOnTop(bool top,
                                        const std::string& level,
                                        int relativeLevel,
                                        std::string* error) {
+  if (top) {
+    NativeWindow::NotifyWindowEnterAlwaysOnTop();
+  } else {
+    NativeWindow::NotifyWindowLeaveAlwaysOnTop();
+  }
+
   widget()->SetAlwaysOnTop(top);
 }