linux: Implement win.setParentWindow(parent)

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index b72c62704ed29e71821ecf46469520d61340bcc6..a3df8f9c08d8661b37452b449cdaeb05b70376a1 100644 (file)
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -144,6 +144,17 @@ void Window::WillCloseWindow(bool* prevent_default) {
   *prevent_default = Emit("close");
 }
 
+void Window::WillDestoryNativeObject() {
+  // Close all child windows before closing current window.
+  v8::Locker locker(isolate());
+  v8::HandleScope handle_scope(isolate());
+  for (v8::Local<v8::Value> value : child_windows_.Values(isolate())) {
+    mate::Handle<Window> child;
+    if (mate::ConvertFromV8(isolate(), value, &child))
+      child->window_->CloseImmediately();
+  }
+}
+
 void Window::OnWindowClosed() {
   api_web_contents_->DestroyWebContents();
 
@@ -734,6 +745,7 @@ void Window::SetModal(bool modal, mate::Arguments* args) {
     parent->Disable();
   else
     parent->Enable();
+  window_->SetModal(modal);
   is_modal_ = modal;
 }
 

diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h
index e5522f958e076baef73b3cdcdfcce402df94405e..238e3ad7e1f00c55ddf1385c025fb78ddde88e36 100644 (file)
--- a/atom/browser/api/atom_api_window.h
+++ b/atom/browser/api/atom_api_window.h
@@ -60,6 +60,7 @@ class Window : public mate::TrackableObject<Window>,
 
   // NativeWindowObserver:
   void WillCloseWindow(bool* prevent_default) override;
+  void WillDestoryNativeObject() override;
   void OnWindowClosed() override;
   void OnWindowBlur() override;
   void OnWindowFocus() override;

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 73698b7f412767c663aa41f4424b1a067a1f94c4..2ce6779d6205976683177c241f3cb16547ff5fa8 100644 (file)
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -403,6 +403,9 @@ void NativeWindow::CloseContents(content::WebContents* source) {
   inspectable_web_contents_ = nullptr;
   Observe(nullptr);
 
+  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
+                    WillDestoryNativeObject());
+
   // When the web contents is gone, close the window immediately, but the
   // memory will not be freed until you call delete.
   // In this way, it would be safe to manage windows via smart pointers. If you

diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index bcfa487b97506e077d1fc66e1bca9ecffcb8b1d6..d20146819d48568e81a03cacac6f912440ee43eb 100644 (file)
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -165,6 +165,7 @@ class NativeWindow : public base::SupportsUserData,
   virtual void SetParentWindow(NativeWindow* parent) = 0;
   virtual void BeginSheet(NativeWindow* sheet);
   virtual void EndSheet(NativeWindow* sheet);
+  virtual void SetModal(bool modal) = 0;
   virtual gfx::NativeWindow GetNativeWindow() = 0;
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() = 0;
 

diff --git a/atom/browser/native_window_mac.h b/atom/browser/native_window_mac.h
index 0806cfa28c3dc46c547a5c5e9f929c454a7a3b73..3061663520ad9832f4cfdb16c8a63037a2d5131d 100644 (file)
--- a/atom/browser/native_window_mac.h
+++ b/atom/browser/native_window_mac.h
@@ -85,6 +85,7 @@ class NativeWindowMac : public NativeWindow {
   void SetParentWindow(NativeWindow* parent) override;
   void BeginSheet(NativeWindow* sheet) override;
   void EndSheet(NativeWindow* sheet) override;
+  void SetModal(bool modal) override;
   gfx::NativeWindow GetNativeWindow() override;
   gfx::AcceleratedWidget GetAcceleratedWidget() override;
   void SetProgressBar(double progress) override;

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 90b62cf7d2d1f061db7d5c6d580449a988e5fc20..f68d49929ab914112e1f9569a7e5ebdddbdb95e1 100644 (file)
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -634,10 +634,6 @@ void NativeWindowMac::Close() {
 }
 
 void NativeWindowMac::CloseImmediately() {
-  // Close all child windows before closing this window.
-  for (NSWindow* child in [window_ childWindows])
-    [child close];
-
   [window_ close];
 }
 
@@ -981,6 +977,9 @@ void NativeWindowMac::EndSheet(NativeWindow* sheet) {
   sheet->CloseImmediately();
 }
 
+void NativeWindowMac::SetModal(bool modal) {
+}
+
 gfx::NativeWindow NativeWindowMac::GetNativeWindow() {
   return window_;
 }

diff --git a/atom/browser/native_window_observer.h b/atom/browser/native_window_observer.h
index 73bf4362f57f96961357015e74dbeb32132c954d..16541d0909004791367fa28ed1a5388d63029212 100644 (file)
--- a/atom/browser/native_window_observer.h
+++ b/atom/browser/native_window_observer.h
@@ -33,6 +33,9 @@ class NativeWindowObserver {
   // Called when the window is gonna closed.
   virtual void WillCloseWindow(bool* prevent_default) {}
 
+  // Called before the native window object is going to be destroyed.
+  virtual void WillDestoryNativeObject() {}
+
   // Called when the window is closed.
   virtual void OnWindowClosed() {}
 

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 803a3e2153761066afb574f5d306736d27e59f3d..f5c21bed74eea3151885c3cff9bba65a48ab168a 100644 (file)
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -187,10 +187,10 @@ NativeWindowViews::NativeWindowViews(
   if (options.Get(options::kFocusable, &focusable) && !focusable)
     params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
 
+#if defined(OS_WIN)
   if (parent)
     params.parent = parent->GetNativeWindow();
 
-#if defined(OS_WIN)
   params.native_widget =
       new views::DesktopNativeWidgetAura(window_.get());
   atom_desktop_window_tree_host_win_ = new AtomDesktopWindowTreeHostWin(
@@ -248,6 +248,9 @@ NativeWindowViews::NativeWindowViews(
   std::string window_type;
   if (options.Get(options::kType, &window_type))
     SetWindowType(GetAcceleratedWidget(), window_type);
+
+  if (parent)
+    SetParentWindow(parent);
 #endif
 
   // Add web view.
@@ -379,15 +382,25 @@ bool NativeWindowViews::IsVisible() {
 }
 
 void NativeWindowViews::Disable() {
+#if defined(OS_WIN)
   ::EnableWindow(GetAcceleratedWidget(), FALSE);
+#elif defined(USE_X11)
+#endif
 }
 
 void NativeWindowViews::Enable() {
+#if defined(OS_WIN)
   ::EnableWindow(GetAcceleratedWidget(), TRUE);
+#elif defined(USE_X11)
+#endif
 }
 
 bool NativeWindowViews::IsEnabled() {
+#if defined(OS_WIN)
   return ::IsWindowEnabled(GetAcceleratedWidget());
+#else
+  return false;
+#endif
 }
 
 void NativeWindowViews::Maximize() {
@@ -790,9 +803,14 @@ void NativeWindowViews::SetMenu(ui::MenuModel* menu_model) {
 }
 
 void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
+#if defined(USE_X11)
+  XDisplay* xdisplay = gfx::GetXDisplay();
+  XSetTransientForHint(
+      xdisplay, GetAcceleratedWidget(),
+      parent? parent->GetAcceleratedWidget() : DefaultRootWindow(xdisplay));
+#elif defined(OS_WIN) && defined(DEBUG)
   // Should work, but does not, it seems that the views toolkit doesn't support
   // reparenting on desktop.
-#if defined(DEBUG)
   if (parent) {
     ::SetParent(GetAcceleratedWidget(), parent->GetAcceleratedWidget());
     views::Widget::ReparentNativeView(GetNativeWindow(),
@@ -801,12 +819,21 @@ void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
   } else {
     if (!GetNativeWindow()->parent())
       return;
+    ::SetParent(GetAcceleratedWidget(), NULL);
     views::Widget::ReparentNativeView(GetNativeWindow(), nullptr);
     wm::RemoveTransientChild(GetNativeWindow()->parent(), GetNativeWindow());
   }
 #endif
 }
 
+void NativeWindowViews::SetModal(bool modal) {
+#if defined(USE_X11)
+  SetWMSpecState(GetAcceleratedWidget(), modal,
+                 GetAtom("_NET_WM_STATE_MODAL"));
+  SetWindowType(GetAcceleratedWidget(), modal ? "dialog" : "normal");
+#endif
+}
+
 gfx::NativeWindow NativeWindowViews::GetNativeWindow() {
   return window_->GetNativeWindow();
 }

diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
index 95a95120f46d2aebeb1715a457fa3e32e331c557..b38572d9d2ad9c0fee8da363523f74956d548494 100644 (file)
--- a/atom/browser/native_window_views.h
+++ b/atom/browser/native_window_views.h
@@ -99,6 +99,7 @@ class NativeWindowViews : public NativeWindow,
   void SetFocusable(bool focusable) override;
   void SetMenu(ui::MenuModel* menu_model) override;
   void SetParentWindow(NativeWindow* parent) override;
+  void SetModal(bool modal) override;
   gfx::NativeWindow GetNativeWindow() override;
   void SetOverlayIcon(const gfx::Image& overlay,
                       const std::string& description) override;

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 51f7d2514859d73ff3b21f90febc99570dfeb6d8..e9813af5b75941607cd16d78b077da136fc5625d 100644 (file)
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -868,7 +868,7 @@ describe('browser-window module', function () {
     })
 
     describe('win.setParentWindow(parent)', function () {
-      if (process.platform !== 'darwin') return
+      if (process.platform === 'win32') return
 
       beforeEach(function () {
         if (c != null) c.destroy()